diff options
| author | Adam Powell <adamp@google.com> | 2010-11-18 12:11:40 -0800 |
|---|---|---|
| committer | Adam Powell <adamp@google.com> | 2010-11-18 12:31:56 -0800 |
| commit | b33be1c672f459d94b151b3b2e3859a7655a7fa3 (patch) | |
| tree | e9424d93720044610ce3970bf47a637492121ba2 /core | |
| parent | 1c60300129e431ccf1cf258291eac5acdb3a2fe4 (diff) | |
| download | frameworks_base-b33be1c672f459d94b151b3b2e3859a7655a7fa3.zip frameworks_base-b33be1c672f459d94b151b3b2e3859a7655a7fa3.tar.gz frameworks_base-b33be1c672f459d94b151b3b2e3859a7655a7fa3.tar.bz2 | |
Fix bug 3208911 - apps not getting default ActionBar style values
Change-Id: Ie2855d6ebbaf49d187dc8bd63fda7f1b397325b5
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/com/android/internal/widget/ActionBarView.java | 15 | ||||
| -rw-r--r-- | core/res/res/values/styles.xml | 2 | ||||
| -rw-r--r-- | core/res/res/values/themes.xml | 1 |
3 files changed, 10 insertions, 8 deletions
diff --git a/core/java/com/android/internal/widget/ActionBarView.java b/core/java/com/android/internal/widget/ActionBarView.java index b382cee..f931217 100644 --- a/core/java/com/android/internal/widget/ActionBarView.java +++ b/core/java/com/android/internal/widget/ActionBarView.java @@ -173,7 +173,8 @@ public class ActionBarView extends ViewGroup { final LayoutInflater inflater = LayoutInflater.from(context); final int homeResId = a.getResourceId( - com.android.internal.R.styleable.ActionBar_homeLayout, 0); + com.android.internal.R.styleable.ActionBar_homeLayout, + com.android.internal.R.layout.action_bar_home); mHomeLayout = inflater.inflate(homeResId, this, false); @@ -210,13 +211,13 @@ public class ActionBarView extends ViewGroup { mLogoNavItem = new ActionMenuItem(context, 0, android.R.id.home, 0, 0, mTitle); mHomeLayout.setOnClickListener(new OnClickListener() { - public void onClick(View v) { - Context context = getContext(); - if (context instanceof Activity) { - Activity activity = (Activity) context; - activity.onMenuItemSelected(Window.FEATURE_OPTIONS_PANEL, mLogoNavItem); + public void onClick(View v) { + Context context = getContext(); + if (context instanceof Activity) { + Activity activity = (Activity) context; + activity.onMenuItemSelected(Window.FEATURE_OPTIONS_PANEL, mLogoNavItem); + } } - } }); mHomeLayout.setClickable(true); mHomeLayout.setFocusable(true); diff --git a/core/res/res/values/styles.xml b/core/res/res/values/styles.xml index 457ba0c..403ec2f 100644 --- a/core/res/res/values/styles.xml +++ b/core/res/res/values/styles.xml @@ -917,7 +917,7 @@ <item name="android:subtitleTextStyle">@android:style/TextAppearance.Widget.ActionBar.Subtitle</item> <item name="android:progressBarStyle">@android:style/Widget.ProgressBar.Horizontal</item> <item name="android:indeterminateProgressStyle">@android:style/Widget.ProgressBar.Small</item> - <item name="android:homeLayout">@layout/action_bar_home</item> + <item name="android:homeLayout">@android:layout/action_bar_home</item> </style> <style name="Widget.ActionMode"> diff --git a/core/res/res/values/themes.xml b/core/res/res/values/themes.xml index b5dcf05..f5dca47 100644 --- a/core/res/res/values/themes.xml +++ b/core/res/res/values/themes.xml @@ -92,6 +92,7 @@ <item name="groupButtonBackground">@null</item> <item name="selectableItemBackground">@android:drawable/item_background</item> + <item name="homeAsUpIndicator">@android:drawable/ic_ab_back_holo_dark</item> <!-- List attributes --> <item name="listPreferredItemHeight">64dip</item> |