diff options
author | Raj Yengisetty <rajesh@cyngn.com> | 2014-10-21 17:38:40 -0700 |
---|---|---|
committer | linus_lee <llee@cyngn.com> | 2014-11-20 12:51:34 -0800 |
commit | fe242eb6bfacb04b94763bd24ef07e1006ac37de (patch) | |
tree | d5cad10a9515827720bc1eaaa408fcd131dfcbdb | |
parent | 03be0af2b15a3aac41ab5cf94e099a4e17ccbc48 (diff) | |
download | android_packages_apps_Eleven-fe242eb6bfacb04b94763bd24ef07e1006ac37de.tar.gz android_packages_apps_Eleven-fe242eb6bfacb04b94763bd24ef07e1006ac37de.tar.bz2 android_packages_apps_Eleven-fe242eb6bfacb04b94763bd24ef07e1006ac37de.zip |
Eleven: Fix action bar spacing
https://cyanogen.atlassian.net/browse/MUSIC-45
Change-Id: I02f4b72db7176eb815610133b1dc4c9507c196d7
-rw-r--r-- | AndroidManifest.xml | 1 | ||||
-rw-r--r-- | res/drawable-hdpi/ic_action_back_padded.png | bin | 0 -> 1144 bytes | |||
-rw-r--r-- | res/drawable-mdpi/ic_action_back_padded.png | bin | 0 -> 1061 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/ic_action_back_padded.png | bin | 0 -> 1161 bytes | |||
-rw-r--r-- | res/drawable-xxhdpi/ic_action_back_padded.png | bin | 0 -> 1260 bytes | |||
-rw-r--r-- | res/values/styles.xml | 8 | ||||
-rw-r--r-- | src/com/cyngn/eleven/ui/activities/HomeActivity.java | 4 | ||||
-rw-r--r-- | src/com/cyngn/eleven/ui/activities/SettingsActivity.java | 2 |
8 files changed, 10 insertions, 5 deletions
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 Binary files differnew file mode 100644 index 0000000..c4bca67 --- /dev/null +++ b/res/drawable-hdpi/ic_action_back_padded.png diff --git a/res/drawable-mdpi/ic_action_back_padded.png b/res/drawable-mdpi/ic_action_back_padded.png Binary files differnew file mode 100644 index 0000000..cca0e8a --- /dev/null +++ b/res/drawable-mdpi/ic_action_back_padded.png diff --git a/res/drawable-xhdpi/ic_action_back_padded.png b/res/drawable-xhdpi/ic_action_back_padded.png Binary files differnew file mode 100644 index 0000000..5ee9938 --- /dev/null +++ b/res/drawable-xhdpi/ic_action_back_padded.png diff --git a/res/drawable-xxhdpi/ic_action_back_padded.png b/res/drawable-xxhdpi/ic_action_back_padded.png Binary files differnew file mode 100644 index 0000000..17b95f7 --- /dev/null +++ b/res/drawable-xxhdpi/ic_action_back_padded.png 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 |