summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
authorDanny Baumann <dannybaumann@web.de>2015-01-22 15:05:33 +0100
committerDanny Baumann <dannybaumann@web.de>2015-01-22 15:06:29 +0100
commit5ede4fea10abdfc04dbfaa411268568ecce87f95 (patch)
treee6d35145962ee092cc2d0c9146978d2d139b67d0 /res/layout
parentcc342519488d50d2f59f514940de6cf02bd53ab2 (diff)
downloadandroid_packages_apps_Trebuchet-5ede4fea10abdfc04dbfaa411268568ecce87f95.zip
android_packages_apps_Trebuchet-5ede4fea10abdfc04dbfaa411268568ecce87f95.tar.gz
android_packages_apps_Trebuchet-5ede4fea10abdfc04dbfaa411268568ecce87f95.tar.bz2
Fix settings pane button alignment.
The addition of the manage apps button caused unnecessary line wraps for some languages (e.g. DE), and the manage apps icon had a size different from the other icons in that pane. Change-Id: I3faaf32d9826a817250190517583764a2574bfb0
Diffstat (limited to 'res/layout')
-rwxr-xr-xres/layout/settings_pane.xml70
1 files changed, 13 insertions, 57 deletions
diff --git a/res/layout/settings_pane.xml b/res/layout/settings_pane.xml
index 77c8d4d..909dc03 100755
--- a/res/layout/settings_pane.xml
+++ b/res/layout/settings_pane.xml
@@ -29,92 +29,48 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
android:orientation="horizontal"
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="0.5" />
-
<TextView
android:id="@+id/wallpaper_button"
android:layout_width="0dip"
android:layout_height="wrap_content"
- android:drawablePadding="4dp"
+ android:layout_weight="1"
+ style="@style/SettingsPaneButton"
android:drawableTop="@drawable/wallpaper_button"
- android:fontFamily="sans-serif-condensed"
- android:gravity="center_horizontal"
- android:layout_weight="2"
- 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="0.5" />
+ android:text="@string/wallpaper_button_text" />
<TextView
android:id="@+id/widget_button"
android:layout_width="0dip"
android:layout_height="wrap_content"
- android:drawablePadding="4dp"
+ android:layout_weight="1"
+ style="@style/SettingsPaneButton"
android:drawableTop="@drawable/widget_button"
- android:fontFamily="sans-serif-condensed"
- android:gravity="center_horizontal"
- android:layout_weight="2"
- 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="0.5" />
+ android:text="@string/widget_button_text" />
<TextView
android:id="@+id/settings_button"
android:layout_width="0dip"
android:layout_height="wrap_content"
- android:drawablePadding="4dp"
+ android:layout_weight="1"
+ style="@style/SettingsPaneButton"
android:drawableTop="@drawable/setting_button"
- android:fontFamily="sans-serif-condensed"
- android:gravity="center_horizontal"
- android:layout_weight="2"
- android:text="@string/settings_button_text"
- android:textAllCaps="true"
- android:textSize="12sp"
- android:textColor="@android:color/white"
- android:maxLines="2" />
+ android:text="@string/settings_button_text" />
<TextView
android:id="@+id/manage_apps_button"
android:layout_width="0dip"
android:layout_height="wrap_content"
- android:drawablePadding="4dp"
+ android:layout_weight="1"
+ style="@style/SettingsPaneButton"
android:drawableTop="@drawable/manage_apps_button"
- android:fontFamily="sans-serif-condensed"
- android:gravity="center_horizontal"
- android:layout_weight="2"
- android:text="@string/manage_apps_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="0.5" />
+ android:text="@string/manage_apps_button_text" />
</LinearLayout>
+
</LinearLayout>
<view