Tiny differences to back port from review of diff with BS Pluszxing-2.3.0ZXingTest-1.4.1BS-4.5.1

15 files changed, 38 insertions, 31 deletions

diff --git a/android/res/layout-land/encode.xml b/android/res/layout-land/encode.xml
index 947f97017..fa185dc1d 100755
--- a/android/res/layout-land/encode.xml
+++ b/android/res/layout-land/encode.xml
@@ -41,7 +41,8 @@
               android:textColor="@color/contents_text"
               android:paddingRight="8dip"
               android:paddingTop="8dip"
-              android:paddingBottom="8dip"/>
+              android:paddingBottom="8dip"
+              android:textIsSelectable="true"/>
 
   </ScrollView>
 
diff --git a/android/res/layout-land/share.xml b/android/res/layout-land/share.xml
index 913835266..5531c8aa0 100755
--- a/android/res/layout-land/share.xml
+++ b/android/res/layout-land/share.xml
@@ -27,7 +27,8 @@
       android:layout_height="wrap_content"
       android:gravity="center"
       android:text="@string/msg_share_explanation"
-      android:paddingBottom="12dip"/>
+      android:paddingBottom="12dip"
+      android:textIsSelectable="false"/>
 
   <LinearLayout
       android:layout_width="fill_parent"
diff --git a/android/res/layout-ldpi/capture.xml b/android/res/layout-ldpi/capture.xml
index da00412a2..d685f38d5 100755
--- a/android/res/layout-ldpi/capture.xml
+++ b/android/res/layout-ldpi/capture.xml
@@ -151,7 +151,8 @@
                     android:textColorLink="@color/result_text"
                     android:textSize="22sp"
                     android:paddingLeft="12dip"
-                    android:autoLink="web"/>
+                    android:autoLink="web"
+                    android:textIsSelectable="true"/>
 
           <TextView android:id="@+id/contents_supplement_text_view"
                     android:layout_width="wrap_content"
@@ -160,7 +161,7 @@
                     android:textColorLink="@color/result_text"
                     android:paddingLeft="12dip"
                     android:autoLink="web"
-                    android:clickable="true"/>
+                    android:textIsSelectable="true"/>
 
         </LinearLayout>
 
diff --git a/android/res/layout/bookmark_picker_list_item.xml b/android/res/layout/bookmark_picker_list_item.xml
index 5122461c3..b8cb1acf4 100644
--- a/android/res/layout/bookmark_picker_list_item.xml
+++ b/android/res/layout/bookmark_picker_list_item.xml
@@ -25,12 +25,14 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:textAppearance="?android:attr/textAppearanceLarge"            
-            android:singleLine="true"/>
+            android:singleLine="true"
+            android:textIsSelectable="false"/>
 
   <TextView android:id="@+id/bookmark_url"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:textAppearance="?android:attr/textAppearanceSmall"                
-            android:singleLine="false"/>
+            android:singleLine="false"
+            android:textIsSelectable="false"/>
 
 </LinearLayout>
diff --git a/android/res/layout/capture.xml b/android/res/layout/capture.xml
index 9578b3985..cdd1904cd 100755
--- a/android/res/layout/capture.xml
+++ b/android/res/layout/capture.xml
@@ -151,7 +151,8 @@
                     android:textColorLink="@color/result_text"
                     android:textSize="22sp"
                     android:paddingLeft="12dip"
-                    android:autoLink="web"/>
+                    android:autoLink="web"
+                    android:textIsSelectable="true"/>
 
           <TextView android:id="@+id/contents_supplement_text_view"
                     android:layout_width="wrap_content"
@@ -159,7 +160,8 @@
                     android:textColor="@color/result_text"
                     android:textColorLink="@color/result_text"
                     android:paddingLeft="12dip"
-                    android:autoLink="web"/>
+                    android:autoLink="web"
+                    android:textIsSelectable="true"/>
 
         </LinearLayout>
 
diff --git a/android/res/layout/encode.xml b/android/res/layout/encode.xml
index 0dfcbc535..8a876eb7b 100755
--- a/android/res/layout/encode.xml
+++ b/android/res/layout/encode.xml
@@ -42,7 +42,8 @@
               android:textColor="@color/contents_text"
               android:paddingBottom="@dimen/standard_padding"
               android:paddingLeft="@dimen/standard_padding"
-              android:paddingRight="@dimen/standard_padding"/>
+              android:paddingRight="@dimen/standard_padding"
+              android:textIsSelectable="true"/>
 
   </ScrollView>
 
diff --git a/android/res/layout/history_list_item.xml b/android/res/layout/history_list_item.xml
index 1e20d8cf4..81db95e05 100644
--- a/android/res/layout/history_list_item.xml
+++ b/android/res/layout/history_list_item.xml
@@ -11,12 +11,14 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:textAppearance="?android:attr/textAppearanceLarge"
-            android:singleLine="true"/>
+            android:singleLine="true"
+            android:textIsSelectable="false"/>
 
   <TextView android:id="@+id/history_detail"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:textAppearance="?android:attr/textAppearanceSmall"
-            android:singleLine="false"/>
+            android:singleLine="false"
+            android:textIsSelectable="false"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/android/res/layout/search_book_contents_header.xml b/android/res/layout/search_book_contents_header.xml
index 0548eea84..14266a866 100644
--- a/android/res/layout/search_book_contents_header.xml
+++ b/android/res/layout/search_book_contents_header.xml
@@ -20,4 +20,5 @@
           android:paddingLeft="@dimen/standard_padding"
           android:paddingBottom="@dimen/half_padding"
           android:enabled="false"
-          android:singleLine="true"/>
+          android:singleLine="true"
+          android:textIsSelectable="false"/>
diff --git a/android/res/layout/search_book_contents_list_item.xml b/android/res/layout/search_book_contents_list_item.xml
index 229e24e22..889298b25 100644
--- a/android/res/layout/search_book_contents_list_item.xml
+++ b/android/res/layout/search_book_contents_list_item.xml
@@ -27,12 +27,14 @@
             android:layout_gravity="left|top"
             android:layout_marginRight="@dimen/standard_padding"
             android:singleLine="false"
-            android:textStyle="bold"/>
+            android:textStyle="bold"
+            android:textIsSelectable="false"/>
 
   <TextView android:id="@+id/snippet_view"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="left|top"
-            android:singleLine="false"/>
+            android:singleLine="false"
+            android:textIsSelectable="false"/>
 
 </com.google.zxing.client.android.book.SearchBookContentsListItem>
diff --git a/android/res/layout/share.xml b/android/res/layout/share.xml
index 2dc9a8fb9..39ecdc4eb 100755
--- a/android/res/layout/share.xml
+++ b/android/res/layout/share.xml
@@ -35,7 +35,8 @@
         android:layout_height="wrap_content"
         android:gravity="center"
         android:text="@string/msg_share_explanation"
-        android:paddingBottom="@dimen/standard_padding"/>
+        android:paddingBottom="@dimen/standard_padding"
+        android:textIsSelectable="false"/>
 
     <ImageView
         android:layout_width="wrap_content"
diff --git a/android/src/com/google/zxing/client/android/CaptureActivityHandler.java b/android/src/com/google/zxing/client/android/CaptureActivityHandler.java
index d1c846d8c..85aaf291b 100755
--- a/android/src/com/google/zxing/client/android/CaptureActivityHandler.java
+++ b/android/src/com/google/zxing/client/android/CaptureActivityHandler.java
@@ -79,11 +79,9 @@ public final class CaptureActivityHandler extends Handler {
   public void handleMessage(Message message) {
     switch (message.what) {
       case R.id.restart_preview:
-        Log.d(TAG, "Got restart preview message");
         restartPreviewAndDecode();
         break;
       case R.id.decode_succeeded:
-        Log.d(TAG, "Got decode succeeded message");
         state = State.SUCCESS;
         Bundle bundle = message.getData();
         Bitmap barcode = null;
@@ -105,12 +103,10 @@ public final class CaptureActivityHandler extends Handler {
         cameraManager.requestPreviewFrame(decodeThread.getHandler(), R.id.decode);
         break;
       case R.id.return_scan_result:
-        Log.d(TAG, "Got return scan result message");
         activity.setResult(Activity.RESULT_OK, (Intent) message.obj);
         activity.finish();
         break;
       case R.id.launch_product_query:
-        Log.d(TAG, "Got product query message");
         String url = (String) message.obj;
 
         Intent intent = new Intent(Intent.ACTION_VIEW);
diff --git a/android/src/com/google/zxing/client/android/Contents.java b/android/src/com/google/zxing/client/android/Contents.java
index 9e5a86dc5..253df6ff4 100755
--- a/android/src/com/google/zxing/client/android/Contents.java
+++ b/android/src/com/google/zxing/client/android/Contents.java
@@ -58,10 +58,10 @@ public final class Contents {
      * Intent intent = new Intent(Intents.Encode.ACTION);
      * intent.putExtra(Intents.Encode.TYPE, CONTACT);
      * Bundle bundle = new Bundle();
-     * bundle.putString(Contacts.Intents.Insert.NAME, "Jenny");
-     * bundle.putString(Contacts.Intents.Insert.PHONE, "8675309");
-     * bundle.putString(Contacts.Intents.Insert.EMAIL, "jenny@the80s.com");
-     * bundle.putString(Contacts.Intents.Insert.POSTAL, "123 Fake St. San Francisco, CA 94102");
+     * bundle.putString(ContactsContract.Intents.Insert.NAME, "Jenny");
+     * bundle.putString(ContactsContract.Intents.Insert.PHONE, "8675309");
+     * bundle.putString(ContactsContract.Intents.Insert.EMAIL, "jenny@the80s.com");
+     * bundle.putString(ContactsContract.Intents.Insert.POSTAL, "123 Fake St. San Francisco, CA 94102");
      * intent.putExtra(Intents.Encode.DATA, bundle);
      */
     public static final String CONTACT = "CONTACT_TYPE";
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 affa352d8..f05aa9228 100755
--- a/android/src/com/google/zxing/client/android/encode/EncodeActivity.java
+++ b/android/src/com/google/zxing/client/android/encode/EncodeActivity.java
@@ -105,6 +105,7 @@ public final class EncodeActivity extends Activity {
           return false;
         }
         intent.putExtra(USE_VCARD_KEY, !qrCodeEncoder.isUseVCard());
+        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
         startActivity(intent);
         finish();
         return true;
diff --git a/android/src/com/google/zxing/client/android/result/SMSResultHandler.java b/android/src/com/google/zxing/client/android/result/SMSResultHandler.java
index 9b0a8d7d3..8a95943c9 100644
--- a/android/src/com/google/zxing/client/android/result/SMSResultHandler.java
+++ b/android/src/com/google/zxing/client/android/result/SMSResultHandler.java
@@ -51,13 +51,14 @@ public final class SMSResultHandler extends ResultHandler {
   @Override
   public void handleButtonPress(int index) {
     SMSParsedResult smsResult = (SMSParsedResult) getResult();
+    String number = smsResult.getNumbers()[0];
     switch (index) {
       case 0:
         // Don't know of a way yet to express a SENDTO intent with multiple recipients
-        sendSMS(smsResult.getNumbers()[0], smsResult.getBody());
+        sendSMS(number, smsResult.getBody());
         break;
       case 1:
-        sendMMS(smsResult.getNumbers()[0], smsResult.getSubject(), smsResult.getBody());
+        sendMMS(number, smsResult.getSubject(), smsResult.getBody());
         break;
     }
   }
diff --git a/android/src/com/google/zxing/client/android/result/WifiResultHandler.java b/android/src/com/google/zxing/client/android/result/WifiResultHandler.java
index 509b81337..6cd8a277f 100644
--- a/android/src/com/google/zxing/client/android/result/WifiResultHandler.java
+++ b/android/src/com/google/zxing/client/android/result/WifiResultHandler.java
@@ -82,12 +82,7 @@ public final class WifiResultHandler extends ResultHandler {
   @Override
   public CharSequence getDisplayContents() {
     WifiParsedResult wifiResult = (WifiParsedResult) getResult();
-    StringBuilder contents = new StringBuilder(50);
-    String wifiLabel = parent.getString(R.string.wifi_ssid_label);
-    ParsedResult.maybeAppend(wifiLabel + '\n' + wifiResult.getSsid(), contents);
-    String typeLabel = parent.getString(R.string.wifi_type_label);
-    ParsedResult.maybeAppend(typeLabel + '\n' + wifiResult.getNetworkEncryption(), contents);
-    return contents.toString();
+    return wifiResult.getSsid() + " (" + wifiResult.getNetworkEncryption() + ')';
   }
 
   @Override