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

7 files changed, 22 insertions, 11 deletions

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"