Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix setting action bar home-as-up from AB style" into jb-dev

Browse Source
This commit is contained in:
Adam Powell
2012-05-02 15:42:23 -07:00
committed by Android (Google) Code Review
parent 3e1cf5b423 d40423a7ad
commit fbbdbc2d23
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/com/android/internal/app/ActionBarImpl.java
View File

@@ -184,8 +184,15 @@ public class ActionBarImpl extends ActionBar {
mContextDisplayMode = mActionView.isSplitActionBar() ? mContextDisplayMode = mActionView.isSplitActionBar() ?
CONTEXT_DISPLAY_SPLIT : CONTEXT_DISPLAY_NORMAL; 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); ActionBarPolicy abp = ActionBarPolicy.get(mContext);
setHomeButtonEnabled(abp.enableHomeButtonByDefault()); setHomeButtonEnabled(abp.enableHomeButtonByDefault() || homeAsUp);
setHasEmbeddedTabs(abp.hasEmbeddedTabs()); setHasEmbeddedTabs(abp.hasEmbeddedTabs());
} }