From 28fa07e15f7a7ee83be9e5555bbfdd25711b3517 Mon Sep 17 00:00:00 2001 From: Adam Powell Date: Fri, 15 Jul 2011 20:17:25 -0700 Subject: [PATCH] Fix bug 5021359 - show app icon for collapsible action views. Also fix a bug with initial enabled state of the app-home button. Change-Id: I7eac4932deeced3ac209ad899922ac90f40c87e6 --- core/java/com/android/internal/app/ActionBarImpl.java | 6 ++---- core/java/com/android/internal/widget/ActionBarView.java | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/core/java/com/android/internal/app/ActionBarImpl.java b/core/java/com/android/internal/app/ActionBarImpl.java index cf5666c467a9..f0a9441f2be5 100644 --- a/core/java/com/android/internal/app/ActionBarImpl.java +++ b/core/java/com/android/internal/app/ActionBarImpl.java @@ -159,10 +159,8 @@ public class ActionBarImpl extends ActionBar { // Older apps get the home button interaction enabled by default. // Newer apps need to enable it explicitly. - if (mContext.getApplicationInfo().targetSdkVersion < - Build.VERSION_CODES.ICE_CREAM_SANDWICH) { - setHomeButtonEnabled(true); - } + setHomeButtonEnabled(mContext.getApplicationInfo().targetSdkVersion < + Build.VERSION_CODES.ICE_CREAM_SANDWICH); } public void onConfigurationChanged(Configuration newConfig) { diff --git a/core/java/com/android/internal/widget/ActionBarView.java b/core/java/com/android/internal/widget/ActionBarView.java index 58043c9b0ac9..6bb40a455554 100644 --- a/core/java/com/android/internal/widget/ActionBarView.java +++ b/core/java/com/android/internal/widget/ActionBarView.java @@ -1272,7 +1272,7 @@ public class ActionBarView extends AbsActionBarView { @Override public boolean expandItemActionView(MenuBuilder menu, MenuItemImpl item) { mExpandedActionView = item.getActionView(); - mExpandedHomeLayout.setIcon(item.getIcon()); + mExpandedHomeLayout.setIcon(mIcon.getConstantState().newDrawable(getResources())); mCurrentExpandedItem = item; if (mExpandedActionView.getParent() != ActionBarView.this) { addView(mExpandedActionView); -- 2.11.0