Adjust layout for readability in different languages

Change-Id: Iddee1ce9b25819711acd01298a4128312f88b0ae

2 files changed, 32 insertions, 43 deletions

diff --git a/res/layout/settings_pane.xml b/res/layout/settings_pane.xml
index 26ee8fc26..495d0997d 100644
--- a/res/layout/settings_pane.xml
+++ b/res/layout/settings_pane.xml
@@ -20,86 +20,74 @@
 
             <ImageView
                 android:id="@+id/settings_drag_arrow"
-                android:layout_width="@dimen/overview_panel_button_spacing"
-                android:layout_height="@dimen/overview_panel_button_spacing"
+                android:layout_width="@dimen/overview_panel_handle_size"
+                android:layout_height="@dimen/overview_panel_handle_size"
                 android:layout_gravity="center_horizontal"
                 android:adjustViewBounds="true"
                 android:background="@drawable/launcheranimatedarrow_00000"/>
 
-            <LinearLayout
-                android:layout_width="match_parent"
+            <RelativeLayout
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
                 android:orientation="horizontal"
+                android:layout_gravity="center_horizontal|bottom"
                 android:paddingBottom="@dimen/overview_panel_bottom_padding"
-                android:paddingTop="@dimen/overview_panel_list_padding" >
-
-                <Space
-                    android:layout_width="0dip"
-                    android:layout_height="1dp"
-                    android:layout_weight="1" />
+                android:paddingTop="@dimen/overview_panel_list_padding"
+                android:layout_marginLeft="@dimen/overview_panel_button_spacing"
+                android:layout_marginRight="@dimen/overview_panel_button_spacing">
 
                 <TextView
                     android:id="@+id/wallpaper_button"
-                    android:layout_width="0dip"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:drawablePadding="4dp"
                     android:drawableTop="@drawable/wallpaper_button"
                     android:fontFamily="sans-serif-condensed"
                     android:gravity="center_horizontal"
-                    android:layout_weight="2"
+                    android:paddingLeft="@dimen/overview_panel_button_spacing"
+                    android:paddingRight="@dimen/overview_panel_button_spacing"
                     android:text="@string/wallpaper_button_text"
                     android:textAllCaps="true"
                     android:textSize="12sp"
                     android:textColor="@android:color/white"
-                    android:maxLines="2" />
-
-                <Space
-                    android:layout_width="0dip"
-                    android:layout_height="1dp"
-                    android:layout_weight="1" />
+                    android:layout_alignParentTop="true"
+                    android:layout_alignParentLeft="true"/>
 
                 <TextView
                     android:id="@+id/widget_button"
-                    android:layout_width="0dip"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:drawablePadding="4dp"
                     android:drawableTop="@drawable/widget_button"
                     android:fontFamily="sans-serif-condensed"
                     android:gravity="center_horizontal"
-                    android:layout_weight="2"
+                    android:paddingLeft="@dimen/overview_panel_button_spacing"
+                    android:paddingRight="@dimen/overview_panel_button_spacing"
                     android:text="@string/widget_button_text"
                     android:textAllCaps="true"
                     android:textSize="12sp"
                     android:textColor="@android:color/white"
-                    android:maxLines="2" />
-
-                <Space
-                    android:layout_width="0dip"
-                    android:layout_height="1dp"
-                    android:layout_weight="1" />
+                    android:layout_alignParentTop="true"
+                    android:layout_centerHorizontal="true" />
 
                 <TextView
                     android:id="@+id/themes_button"
-                    android:layout_width="0dip"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:drawablePadding="4dp"
                     android:drawableTop="@drawable/themes_button"
                     android:fontFamily="sans-serif-condensed"
                     android:gravity="center_horizontal"
-                    android:layout_weight="2"
+                    android:paddingLeft="@dimen/overview_panel_button_spacing"
+                    android:paddingRight="@dimen/overview_panel_button_spacing"
                     android:text="@string/themes_button_text"
                     android:textAllCaps="true"
                     android:textSize="12sp"
                     android:textColor="@android:color/white"
-                    android:maxLines="2" />
-
-                <Space
-                    android:layout_width="0dip"
-                    android:layout_height="1dp"
-                    android:layout_weight="1" />
+                    android:layout_alignParentTop="true"
+                    android:layout_alignParentRight="true" />
 
-            </LinearLayout>
+            </RelativeLayout>
         </LinearLayout>
 
         <view
diff --git a/res/layout/settings_pane_list_item.xml b/res/layout/settings_pane_list_item.xml
index 2a9d31b95..6e6825fce 100644
--- a/res/layout/settings_pane_list_item.xml
+++ b/res/layout/settings_pane_list_item.xml
@@ -1,4 +1,4 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_gravity="center_horizontal|bottom"
@@ -9,7 +9,7 @@
 
     <TextView
         android:id="@+id/item_name"
-        android:layout_width="wrap_content"
+        android:layout_width="0dip"
         android:layout_height="wrap_content"
         android:drawablePadding="4dp"
         android:fontFamily="sans-serif-condensed"
@@ -17,13 +17,13 @@
         android:paddingBottom="@dimen/overview_panel_list_padding"
         android:paddingTop="@dimen/overview_panel_list_padding"
         android:textSize="20sp"
-        android:textColor="@color/listitem_text"/>
+        android:textColor="@color/listitem_text"
+        android:layout_weight="3" />
 
     <TextView
         android:id="@+id/item_state"
-        android:layout_width="wrap_content"
+        android:layout_width="0dip"
         android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
         android:drawablePadding="4dp"
         android:fontFamily="sans-serif-condensed"
         android:gravity="right"
@@ -31,6 +31,7 @@
         android:paddingTop="@dimen/overview_panel_list_padding"
         android:textSize="20sp"
         android:textAllCaps="true"
-        android:textColor="@color/listitem_text" />
+        android:textColor="@color/listitem_text"
+        android:layout_weight="1" />
 
-</RelativeLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file