From fe242eb6bfacb04b94763bd24ef07e1006ac37de Mon Sep 17 00:00:00 2001
From: Raj Yengisetty <rajesh@cyngn.com>
Date: Tue, 21 Oct 2014 17:38:40 -0700
Subject: Eleven: Fix action bar spacing

https://cyanogen.atlassian.net/browse/MUSIC-45

Change-Id: I02f4b72db7176eb815610133b1dc4c9507c196d7
---
 AndroidManifest.xml                                      |   1 +
 res/drawable-hdpi/ic_action_back_padded.png              | Bin 0 -> 1144 bytes
 res/drawable-mdpi/ic_action_back_padded.png              | Bin 0 -> 1061 bytes
 res/drawable-xhdpi/ic_action_back_padded.png             | Bin 0 -> 1161 bytes
 res/drawable-xxhdpi/ic_action_back_padded.png            | Bin 0 -> 1260 bytes
 res/values/styles.xml                                    |   8 ++++++--
 src/com/cyngn/eleven/ui/activities/HomeActivity.java     |   4 ++--
 src/com/cyngn/eleven/ui/activities/SettingsActivity.java |   2 +-
 8 files changed, 10 insertions(+), 5 deletions(-)
 create mode 100644 res/drawable-hdpi/ic_action_back_padded.png
 create mode 100644 res/drawable-mdpi/ic_action_back_padded.png
 create mode 100644 res/drawable-xhdpi/ic_action_back_padded.png
 create mode 100644 res/drawable-xxhdpi/ic_action_back_padded.png

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7878448..7d8233e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -150,6 +150,7 @@
             android:name=".ui.activities.SearchActivity"
             android:windowSoftInputMode="adjustResize"
             android:exported="true"
+            android:theme="@style/Theme.ActionBarIcon"
             android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.SEARCH" />
diff --git a/res/drawable-hdpi/ic_action_back_padded.png b/res/drawable-hdpi/ic_action_back_padded.png
new file mode 100644
index 0000000..c4bca67
Binary files /dev/null and b/res/drawable-hdpi/ic_action_back_padded.png differ
diff --git a/res/drawable-mdpi/ic_action_back_padded.png b/res/drawable-mdpi/ic_action_back_padded.png
new file mode 100644
index 0000000..cca0e8a
Binary files /dev/null and b/res/drawable-mdpi/ic_action_back_padded.png differ
diff --git a/res/drawable-xhdpi/ic_action_back_padded.png b/res/drawable-xhdpi/ic_action_back_padded.png
new file mode 100644
index 0000000..5ee9938
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_back_padded.png differ
diff --git a/res/drawable-xxhdpi/ic_action_back_padded.png b/res/drawable-xxhdpi/ic_action_back_padded.png
new file mode 100644
index 0000000..17b95f7
Binary files /dev/null and b/res/drawable-xxhdpi/ic_action_back_padded.png differ
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 1e51710..febc029 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -26,7 +26,6 @@
         <item name="android:actionBarStyle">@style/ActionBar</item>
         <item name="android:actionOverflowButtonStyle">@style/ActionOverFlowButton</item>
         <item name="android:actionBarWidgetTheme">@style/ActionBarWidgetTheme</item>
-        <item name="android:homeAsUpIndicator">@drawable/ic_action_back</item>
         <item name="vpiTabPageIndicatorStyle">@style/Eleven.TabPageIndicator</item>
     </style>
 
@@ -76,7 +75,7 @@
     </style>
 
     <!-- Sets the action bar title text style -->
-    <style name="ActionBar" parent="@android:style/Widget.Holo.Light.ActionBar">
+    <style name="ActionBar" parent="@android:style/Widget.Holo.ActionBar">
         <item name="android:titleTextStyle">@style/ActionBar.TitleText</item>
         <item name="android:subtitleTextStyle">@style/ActionBar.SubtitleText</item>
         <item name="android:background">@color/header_action_bar_color</item>
@@ -155,6 +154,11 @@
         <item name="android:backgroundDimEnabled">false</item>
     </style>
 
+    <!-- Search Activity theme -->
+    <style name="Theme.ActionBarIcon"  parent="@style/Eleven.Theme">
+        <item name="android:homeAsUpIndicator">@drawable/ic_action_back</item>
+    </style>
+
     <!-- Notification bar event text -->
     <style name="NotificationText">
         <item name="android:layout_width">match_parent</item>
diff --git a/src/com/cyngn/eleven/ui/activities/HomeActivity.java b/src/com/cyngn/eleven/ui/activities/HomeActivity.java
index bf0659c..10cc3b3 100644
--- a/src/com/cyngn/eleven/ui/activities/HomeActivity.java
+++ b/src/com/cyngn/eleven/ui/activities/HomeActivity.java
@@ -86,7 +86,7 @@ public class HomeActivity extends SlidingPanelActivity {
                         getActionBar().setIcon(R.drawable.ic_launcher);
                         getActionBar().setHomeButtonEnabled(false);
                     } else {
-                        getActionBar().setIcon(R.drawable.ic_action_back);
+                        getActionBar().setIcon(R.drawable.ic_action_back_padded);
                         getActionBar().setHomeButtonEnabled(true);
                     }
                 }
@@ -159,7 +159,7 @@ public class HomeActivity extends SlidingPanelActivity {
                     // this happens when they launch search which is its own activity and then
                     // browse through that back to home activity
                     mLoadedBaseFragment = true;
-                    getActionBar().setIcon(R.drawable.ic_action_back);
+                    getActionBar().setIcon(R.drawable.ic_action_back_padded);
                     getActionBar().setHomeButtonEnabled(true);
                 }
                 // the current top fragment is about to be hidden by what we are replacing
diff --git a/src/com/cyngn/eleven/ui/activities/SettingsActivity.java b/src/com/cyngn/eleven/ui/activities/SettingsActivity.java
index 7f44644..2d9f259 100644
--- a/src/com/cyngn/eleven/ui/activities/SettingsActivity.java
+++ b/src/com/cyngn/eleven/ui/activities/SettingsActivity.java
@@ -63,7 +63,7 @@ public class SettingsActivity extends PreferenceActivity {
         mImageCache = ImageCache.getInstance(this);
 
         // UP
-        getActionBar().setIcon(R.drawable.ic_action_back);
+        getActionBar().setIcon(R.drawable.ic_action_back_padded);
         getActionBar().setHomeButtonEnabled(true);
 
         // Add the preferences
-- 
cgit v1.2.3