From 46e8cef52e4ee0e0cef581a2b1609d1ec7e7ee55 Mon Sep 17 00:00:00 2001
From: srowen <srowen@59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Date: Tue, 30 Nov 2010 05:27:41 +0000
Subject: [PATCH] Make text more easily scrollable

git-svn-id: https://zxing.googlecode.com/svn/trunk@1675 59b500cc-1b3d-0410-9834-0bbf25fbcc57
---
 android/res/layout-land/encode.xml | 23 ++++++++++++------
 android/res/layout/encode.xml      | 39 ++++++++++++++++--------------
 2 files changed, 36 insertions(+), 26 deletions(-)

diff --git a/android/res/layout-land/encode.xml b/android/res/layout-land/encode.xml
index 48ab7e646..00ff780fc 100755
--- a/android/res/layout-land/encode.xml
+++ b/android/res/layout-land/encode.xml
@@ -18,6 +18,7 @@
               android:id="@+id/encode_view"
               android:layout_width="fill_parent"
               android:layout_height="fill_parent"
+              android:fillViewport="true"
               android:background="@color/encode_view"
               android:orientation="horizontal"
               android:gravity="center">
@@ -28,14 +29,20 @@
              android:layout_gravity="center_vertical"
              android:scaleType="center"/>
 
-  <TextView android:id="@+id/contents_text_view"
-            android:layout_width="wrap_content"
+  <ScrollView android:layout_width="wrap_content"
             android:layout_height="fill_parent"
             android:layout_gravity="center_vertical"
-            android:gravity="center"
-            android:textColor="@color/contents_text"
-            android:textSize="18sp"
-            android:paddingRight="8dip"
-            android:paddingTop="8dip"
-            android:paddingBottom="8dip"/>
+            android:gravity="center">
+
+    <TextView android:id="@+id/contents_text_view"
+              android:layout_width="wrap_content"
+              android:layout_height="fill_parent"
+              android:textColor="@color/contents_text"
+              android:textSize="18sp"
+              android:paddingRight="8dip"
+              android:paddingTop="8dip"
+              android:paddingBottom="8dip"/>
+
+  </ScrollView>
+
 </LinearLayout>
diff --git a/android/res/layout/encode.xml b/android/res/layout/encode.xml
index 0e7001d9c..08631ffda 100755
--- a/android/res/layout/encode.xml
+++ b/android/res/layout/encode.xml
@@ -15,24 +15,25 @@
  limitations under the License.
  -->
 
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-            android:id="@+id/encode_view"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:fillViewport="true"
-            android:background="@color/encode_view">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:id="@+id/encode_view"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
+              android:fillViewport="true"
+              android:background="@color/encode_view"
+              android:orientation="vertical"
+              android:gravity="center">
 
-  <LinearLayout android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
-                android:background="@color/encode_view"
-                android:orientation="vertical"
-                android:gravity="center">
+  <ImageView android:id="@+id/image_view"
+             android:layout_width="fill_parent"
+             android:layout_height="wrap_content"
+             android:layout_gravity="center_horizontal"
+             android:scaleType="center"/>
 
-    <ImageView android:id="@+id/image_view"
-               android:layout_width="fill_parent"
-               android:layout_height="wrap_content"
-               android:layout_gravity="center_horizontal"
-               android:scaleType="center"/>
+  <ScrollView android:layout_width="fill_parent"
+              android:layout_height="wrap_content"
+              android:layout_gravity="center_horizontal"
+              android:gravity="center">
 
     <TextView android:id="@+id/contents_text_view"
               android:layout_width="fill_parent"
@@ -44,5 +45,7 @@
               android:paddingBottom="8dip"
               android:paddingLeft="8dip"
               android:paddingRight="8dip"/>
-  </LinearLayout>
-</ScrollView>
\ No newline at end of file
+
+  </ScrollView>
+
+</LinearLayout>