summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDanny Baumann <dannybaumann@web.de>2015-01-22 14:05:33 (GMT)
committerDanny Baumann <dannybaumann@web.de>2015-01-22 14:06:29 (GMT)
commit5ede4fea10abdfc04dbfaa411268568ecce87f95 (patch)
treee6d35145962ee092cc2d0c9146978d2d139b67d0
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
-rw-r--r--res/drawable-hdpi/ic_apps.pngbin587 -> 509 bytes
-rw-r--r--res/drawable-hdpi/ic_apps_pressed.pngbin589 -> 503 bytes
-rw-r--r--res/drawable-mdpi/ic_apps.pngbin380 -> 334 bytes
-rw-r--r--res/drawable-mdpi/ic_apps_pressed.pngbin406 -> 357 bytes
-rw-r--r--res/drawable-xhdpi/ic_apps.pngbin664 -> 512 bytes
-rw-r--r--res/drawable-xhdpi/ic_apps_pressed.pngbin652 -> 508 bytes
-rw-r--r--res/drawable-xxhdpi/ic_apps.pngbin1180 -> 803 bytes
-rw-r--r--res/drawable-xxhdpi/ic_apps_pressed.pngbin1152 -> 776 bytes
-rwxr-xr-xres/layout/settings_pane.xml70
-rw-r--r--res/values/styles.xml12
10 files changed, 25 insertions, 57 deletions
diff --git a/res/drawable-hdpi/ic_apps.png b/res/drawable-hdpi/ic_apps.png
index 1f5bc89..6da41f6 100644
--- a/res/drawable-hdpi/ic_apps.png
+++ b/res/drawable-hdpi/ic_apps.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_apps_pressed.png b/res/drawable-hdpi/ic_apps_pressed.png
index e1edaab..d4717ff 100644
--- a/res/drawable-hdpi/ic_apps_pressed.png
+++ b/res/drawable-hdpi/ic_apps_pressed.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_apps.png b/res/drawable-mdpi/ic_apps.png
index 5df8984..608acd5 100644
--- a/res/drawable-mdpi/ic_apps.png
+++ b/res/drawable-mdpi/ic_apps.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_apps_pressed.png b/res/drawable-mdpi/ic_apps_pressed.png
index 30b569b..25de0ac 100644
--- a/res/drawable-mdpi/ic_apps_pressed.png
+++ b/res/drawable-mdpi/ic_apps_pressed.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_apps.png b/res/drawable-xhdpi/ic_apps.png
index 3501486..cec513b 100644
--- a/res/drawable-xhdpi/ic_apps.png
+++ b/res/drawable-xhdpi/ic_apps.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_apps_pressed.png b/res/drawable-xhdpi/ic_apps_pressed.png
index ef48829..34265a6 100644
--- a/res/drawable-xhdpi/ic_apps_pressed.png
+++ b/res/drawable-xhdpi/ic_apps_pressed.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_apps.png b/res/drawable-xxhdpi/ic_apps.png
index 9860a44..ad52a65 100644
--- a/res/drawable-xxhdpi/ic_apps.png
+++ b/res/drawable-xxhdpi/ic_apps.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_apps_pressed.png b/res/drawable-xxhdpi/ic_apps_pressed.png
index a2354aa..0b285a6 100644
--- a/res/drawable-xxhdpi/ic_apps_pressed.png
+++ b/res/drawable-xxhdpi/ic_apps_pressed.png
Binary files differ
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
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 56a205f..3ab25a2 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -78,6 +78,18 @@
<item name="android:shadowRadius">4.0</item>
</style>
+ <style name="SettingsPaneButton">
+ <item name="android:paddingLeft">4dp</item>
+ <item name="android:paddingRight">4dp</item>
+ <item name="android:drawablePadding">4dp</item>
+ <item name="android:fontFamily">sans-serif-condensed</item>
+ <item name="android:gravity">center_horizontal</item>
+ <item name="android:textColor">@android:color/white</item>
+ <item name="android:textSize">12sp</item>
+ <item name="android:textAllCaps">true</item>
+ <item name="android:maxLines">2</item>
+ </style>
+
<style name="TabIndicator">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">match_parent</item>