From d40423a7adff41463fb4a563becc0bd77fe9919c Mon Sep 17 00:00:00 2001 From: Adam Powell Date: Wed, 2 May 2012 14:06:03 -0700 Subject: [PATCH] Fix setting action bar home-as-up from AB style Bug 6427860 Change-Id: I0052417a2c97560ade768509781b27b5e064660d --- core/java/com/android/internal/app/ActionBarImpl.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/core/java/com/android/internal/app/ActionBarImpl.java b/core/java/com/android/internal/app/ActionBarImpl.java index d0071e3af6026..ed711f3ecc274 100644 --- a/core/java/com/android/internal/app/ActionBarImpl.java +++ b/core/java/com/android/internal/app/ActionBarImpl.java @@ -184,8 +184,15 @@ public class ActionBarImpl extends ActionBar { mContextDisplayMode = mActionView.isSplitActionBar() ? CONTEXT_DISPLAY_SPLIT : CONTEXT_DISPLAY_NORMAL; + // This was initially read from the action bar style + final int current = mActionView.getDisplayOptions(); + final boolean homeAsUp = (current & DISPLAY_HOME_AS_UP) != 0; + if (homeAsUp) { + mDisplayHomeAsUpSet = true; + } + ActionBarPolicy abp = ActionBarPolicy.get(mContext); - setHomeButtonEnabled(abp.enableHomeButtonByDefault()); + setHomeButtonEnabled(abp.enableHomeButtonByDefault() || homeAsUp); setHasEmbeddedTabs(abp.hasEmbeddedTabs()); }