Unbroke the app after the big subpackage reshuffle of '09:

- Updated manifest entries.
- Made necessary classes public.
- Fixed ProGuard exclusions.
- Updated resource file class name.

git-svn-id: http://zxing.googlecode.com/svn/trunk@1065 59b500cc-1b3d-0410-9834-0bbf25fbcc57

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 1b685b6..029b33f 100755 (executable)
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -71,10 +71,10 @@ versionName is 2.31, 2.4, or 3.0. -->
         <data android:scheme="http" android:host="www.google.co.uk" android:path="/m/products/scan" />
       </intent-filter>
     </activity>
-    <activity android:name="PreferencesActivity"
+    <activity android:name=".PreferencesActivity"
               android:label="@string/preferences_name">
     </activity>
-    <activity android:name="EncodeActivity">
+    <activity android:name=".encode.EncodeActivity">
       <intent-filter>
         <action android:name="com.google.zxing.client.android.ENCODE"/>
         <category android:name="android.intent.category.DEFAULT"/>
@@ -85,7 +85,7 @@ versionName is 2.31, 2.4, or 3.0. -->
         <category android:name="android.intent.category.DEFAULT"/>
       </intent-filter>
     </activity>
-    <activity android:name="SearchBookContentsActivity"
+    <activity android:name=".book.SearchBookContentsActivity"
               android:label="@string/sbc_name"
               android:screenOrientation="landscape"
               android:configChanges="orientation|keyboardHidden">
@@ -99,7 +99,7 @@ versionName is 2.31, 2.4, or 3.0. -->
         <category android:name="android.intent.category.DEFAULT"/>
       </intent-filter>
     </activity>
-    <activity android:name="ShareActivity"
+    <activity android:name=".share.ShareActivity"
               android:label="@string/share_name"
               android:screenOrientation="user">
       <intent-filter>
@@ -107,14 +107,14 @@ versionName is 2.31, 2.4, or 3.0. -->
         <category android:name="android.intent.category.DEFAULT"/>
       </intent-filter>
     </activity>
-    <activity android:name="BookmarkPickerActivity"
+    <activity android:name=".share.BookmarkPickerActivity"
               android:label="@string/bookmark_picker_name">
       <intent-filter>
         <action android:name="android.intent.action.PICK"/>
         <category android:name="android.intent.category.DEFAULT"/>
       </intent-filter>
     </activity>
-    <activity android:name="HelpActivity"
+    <activity android:name=".HelpActivity"
               android:screenOrientation="user">
       <intent-filter>
         <action android:name="android.intent.action.VIEW"/>

diff --git a/android/build.xml b/android/build.xml
index c038b41..0454357 100644 (file)
--- a/android/build.xml
+++ b/android/build.xml
@@ -196,7 +196,7 @@ limitations under the License.
       <arg value="-libraryjars ${libraryjars.path}"/>
       <arg value="-keep class com.google.zxing.client.android.*Activity"/>
       <arg value="-keep class com.google.zxing.client.android.ViewfinderView { public * ; }"/>
-      <arg value="-keep class com.google.zxing.client.android.SearchBookContents* { public * ; }"/>
+      <arg value="-keep class com.google.zxing.client.android.book.SearchBookContents* { public * ; }"/>
       <arg value="-target 5"/>
       <arg value="-optimizationpasses 7"/>
       <arg value="-dontshrink"/>

diff --git a/android/res/layout/search_book_contents_list_item.xml b/android/res/layout/search_book_contents_list_item.xml
index 08b7a8b..a79f5a0 100644 (file)
--- a/android/res/layout/search_book_contents_list_item.xml
+++ b/android/res/layout/search_book_contents_list_item.xml
@@ -14,7 +14,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
  -->
-<com.google.zxing.client.android.SearchBookContentsListItem
+<com.google.zxing.client.android.book.SearchBookContentsListItem
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="horizontal"
     android:layout_width="fill_parent"
@@ -22,7 +22,6 @@
     android:background="@color/sbc_list_item"
     android:padding="8px">
 
-
   <TextView android:id="@+id/page_number_view"
             android:layout_width="75px"
             android:layout_height="wrap_content"
@@ -42,4 +41,4 @@
             android:textSize="16sp"
             android:typeface="serif"/>
 
-</com.google.zxing.client.android.SearchBookContentsListItem>
+</com.google.zxing.client.android.book.SearchBookContentsListItem>

diff --git a/android/src/com/google/zxing/client/android/book/SearchBookContentsListItem.java b/android/src/com/google/zxing/client/android/book/SearchBookContentsListItem.java
index 0700b01..547d83a 100644 (file)
--- a/android/src/com/google/zxing/client/android/book/SearchBookContentsListItem.java
+++ b/android/src/com/google/zxing/client/android/book/SearchBookContentsListItem.java
@@ -16,22 +16,23 @@
 
 package com.google.zxing.client.android.book;
 
+import com.google.zxing.client.android.R;
+
 import android.content.Context;
 import android.graphics.Typeface;
-import android.text.SpannableString;
 import android.text.Spannable;
+import android.text.SpannableString;
 import android.text.style.StyleSpan;
 import android.util.AttributeSet;
 import android.widget.LinearLayout;
 import android.widget.TextView;
-import com.google.zxing.client.android.R;
 
 /**
  * A list item which displays the page number and snippet of this search result.
  *
  * @author dswitkin@google.com (Daniel Switkin)
  */
-final class SearchBookContentsListItem extends LinearLayout {
+public final class SearchBookContentsListItem extends LinearLayout {
   private TextView pageNumberView;
   private TextView snippetView;
 

diff --git a/android/src/com/google/zxing/client/android/encode/EncodeActivity.java b/android/src/com/google/zxing/client/android/encode/EncodeActivity.java
index 9f50e47..926a914 100755 (executable)
--- a/android/src/com/google/zxing/client/android/encode/EncodeActivity.java
+++ b/android/src/com/google/zxing/client/android/encode/EncodeActivity.java
@@ -16,6 +16,9 @@
 
 package com.google.zxing.client.android.encode;
 
+import com.google.zxing.client.android.Intents;
+import com.google.zxing.client.android.R;
+
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.ProgressDialog;
@@ -31,8 +34,6 @@ import android.view.View;
 import android.view.ViewTreeObserver.OnGlobalLayoutListener;
 import android.widget.ImageView;
 import android.widget.TextView;
-import com.google.zxing.client.android.R;
-import com.google.zxing.client.android.Intents;
 
 /**
  * This class encodes data from an Intent into a QR code, and then displays it full screen so that
@@ -40,7 +41,7 @@ import com.google.zxing.client.android.Intents;
  *
  * @author dswitkin@google.com (Daniel Switkin)
  */
-final class EncodeActivity extends Activity {
+public final class EncodeActivity extends Activity {
   private QRCodeEncoder qrCodeEncoder;
   private ProgressDialog progressDialog;
   private boolean firstLayout;

diff --git a/android/src/com/google/zxing/client/android/share/BookmarkPickerActivity.java b/android/src/com/google/zxing/client/android/share/BookmarkPickerActivity.java
index 026a4ba..b734580 100644 (file)
--- a/android/src/com/google/zxing/client/android/share/BookmarkPickerActivity.java
+++ b/android/src/com/google/zxing/client/android/share/BookmarkPickerActivity.java
@@ -16,6 +16,8 @@
 
 package com.google.zxing.client.android.share;
 
+import com.google.zxing.client.android.R;
+
 import android.app.ListActivity;
 import android.content.Intent;
 import android.database.Cursor;
@@ -25,7 +27,6 @@ import android.view.View;
 import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.SimpleCursorAdapter;
-import com.google.zxing.client.android.R;
 
 /**
  * This class is only needed because I can't successfully send an ACTION_PICK intent to
@@ -33,7 +34,7 @@ import com.google.zxing.client.android.R;
  *
  * @author dswitkin@google.com (Daniel Switkin)
  */
-final class BookmarkPickerActivity extends ListActivity {
+public final class BookmarkPickerActivity extends ListActivity {
   private static final String[] BOOKMARK_PROJECTION = {
       Browser.BookmarkColumns.TITLE,
       Browser.BookmarkColumns.URL