From 5ede4fea10abdfc04dbfaa411268568ecce87f95 Mon Sep 17 00:00:00 2001
From: Danny Baumann <dannybaumann@web.de>
Date: Thu, 22 Jan 2015 15:05:33 +0100
Subject: 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
---
 res/drawable-hdpi/ic_apps.png           | Bin 587 -> 509 bytes
 res/drawable-hdpi/ic_apps_pressed.png   | Bin 589 -> 503 bytes
 res/drawable-mdpi/ic_apps.png           | Bin 380 -> 334 bytes
 res/drawable-mdpi/ic_apps_pressed.png   | Bin 406 -> 357 bytes
 res/drawable-xhdpi/ic_apps.png          | Bin 664 -> 512 bytes
 res/drawable-xhdpi/ic_apps_pressed.png  | Bin 652 -> 508 bytes
 res/drawable-xxhdpi/ic_apps.png         | Bin 1180 -> 803 bytes
 res/drawable-xxhdpi/ic_apps_pressed.png | Bin 1152 -> 776 bytes
 res/layout/settings_pane.xml            |  70 ++++++--------------------------
 res/values/styles.xml                   |  12 ++++++
 10 files changed, 25 insertions(+), 57 deletions(-)

diff --git a/res/drawable-hdpi/ic_apps.png b/res/drawable-hdpi/ic_apps.png
index 1f5bc89f6..6da41f6b3 100644
Binary files a/res/drawable-hdpi/ic_apps.png and b/res/drawable-hdpi/ic_apps.png differ
diff --git a/res/drawable-hdpi/ic_apps_pressed.png b/res/drawable-hdpi/ic_apps_pressed.png
index e1edaab74..d4717ff85 100644
Binary files a/res/drawable-hdpi/ic_apps_pressed.png and b/res/drawable-hdpi/ic_apps_pressed.png differ
diff --git a/res/drawable-mdpi/ic_apps.png b/res/drawable-mdpi/ic_apps.png
index 5df898406..608acd562 100644
Binary files a/res/drawable-mdpi/ic_apps.png and b/res/drawable-mdpi/ic_apps.png differ
diff --git a/res/drawable-mdpi/ic_apps_pressed.png b/res/drawable-mdpi/ic_apps_pressed.png
index 30b569b28..25de0ac3b 100644
Binary files a/res/drawable-mdpi/ic_apps_pressed.png and b/res/drawable-mdpi/ic_apps_pressed.png differ
diff --git a/res/drawable-xhdpi/ic_apps.png b/res/drawable-xhdpi/ic_apps.png
index 350148665..cec513bc9 100644
Binary files a/res/drawable-xhdpi/ic_apps.png and b/res/drawable-xhdpi/ic_apps.png differ
diff --git a/res/drawable-xhdpi/ic_apps_pressed.png b/res/drawable-xhdpi/ic_apps_pressed.png
index ef48829fa..34265a6ee 100644
Binary files a/res/drawable-xhdpi/ic_apps_pressed.png and b/res/drawable-xhdpi/ic_apps_pressed.png differ
diff --git a/res/drawable-xxhdpi/ic_apps.png b/res/drawable-xxhdpi/ic_apps.png
index 9860a441f..ad52a652a 100644
Binary files a/res/drawable-xxhdpi/ic_apps.png and b/res/drawable-xxhdpi/ic_apps.png differ
diff --git a/res/drawable-xxhdpi/ic_apps_pressed.png b/res/drawable-xxhdpi/ic_apps_pressed.png
index a2354aa4d..0b285a6f9 100644
Binary files a/res/drawable-xxhdpi/ic_apps_pressed.png and b/res/drawable-xxhdpi/ic_apps_pressed.png differ
diff --git a/res/layout/settings_pane.xml b/res/layout/settings_pane.xml
index 77c8d4d8a..909dc03c2 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 56a205fd1..3ab25a2de 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>
-- 
cgit v1.2.3