[Android] Info_dialog: fix on smaller layouts

Jean-Baptiste Kempf git at videolan.org
Wed Jun 20 18:49:36 CEST 2012


android | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Jun 20 20:48:01 2012 +0200| [4c482a2e0eb3a716c86abec00427c5b732be768b] | committer: Jean-Baptiste Kempf

Info_dialog: fix on smaller layouts

> http://git.videolan.org/gitweb.cgi/android.git/?a=commit;h=4c482a2e0eb3a716c86abec00427c5b732be768b
---

 vlc-android/res/layout/info_dialog.xml |   41 ++++++++++++++++++++------------
 1 file changed, 26 insertions(+), 15 deletions(-)

diff --git a/vlc-android/res/layout/info_dialog.xml b/vlc-android/res/layout/info_dialog.xml
index 5064c29..830f424 100644
--- a/vlc-android/res/layout/info_dialog.xml
+++ b/vlc-android/res/layout/info_dialog.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:weightSum="1">
+    android:gravity="fill|fill_vertical"
+    android:orientation="vertical"
+    android:weightSum="1" >
+
     <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
@@ -24,23 +25,31 @@
             android:textAppearance="?android:attr/textAppearanceLarge"
             android:text="@string/info_title" />
     </LinearLayout>
-    <TextView
-        android:layout_width="fill_parent"
+
+    <ScrollView
+        android:id="@+id/scrollView1"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:text="@string/beta_warning"
-        android:padding="10dip" />
-    <View
-        android:layout_width="fill_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1" />
+        android:layout_weight="1" >
+
+        <TextView
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:padding="10dip"
+            android:text="@string/beta_warning"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+    </ScrollView>
+
     <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
         android:gravity="center_vertical"
+        android:orientation="horizontal"
         android:padding="10dip"
-        android:visibility="invisible">
+        android:visibility="invisible" >
+
         <CheckBox
             android:id="@+id/not_show_again"
             android:layout_width="wrap_content"
@@ -60,11 +69,13 @@
         android:orientation="horizontal"
         android:gravity="center_horizontal"
         android:weightSum="1">
+
         <Button
             android:id="@+id/ok"
             android:layout_width="0dip"
             android:layout_height="wrap_content"
             android:layout_weight="0.5"
             android:text="@android:string/ok" />
+
     </LinearLayout>
 </LinearLayout>



More information about the Android mailing list