Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 020d5322 authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

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

* commit 'fbbdbc2d':
  Fix setting action bar home-as-up from AB style
parents 21a75218 fbbdbc2d
Loading
Loading
Loading
Loading
+8 −1
Original line number Diff line number Diff line
@@ -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());
    }