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

Commit a9b46824 authored by John Spurlock's avatar John Spurlock
Browse files

Disable disable back if using an alternate back icon. 

This enables the IME down chevron even if back would otherwise
be disabled.

Bug:7453424
Change-Id: Ia007df256124c617b86983bfe6958f790bd6a544
parent bb5c9411

packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java

+4 −1
Original line number Diff line number Diff line
@@ -224,6 +224,8 @@ public class NavigationBarView extends LinearLayout { 
            (0 != (hints & StatusBarManager.NAVIGATION_HINT_BACK_ALT))

                ? (mVertical ? mBackAltLandIcon : mBackAltIcon)

                : (mVertical ? mBackLandIcon : mBackIcon));



        setDisabledFlags(mDisabledFlags, true);

    }



    public void setDisabledFlags(int disabledFlags) {
@@ -237,7 +239,8 @@ public class NavigationBarView extends LinearLayout { 


        final boolean disableHome = ((disabledFlags & View.STATUS_BAR_DISABLE_HOME) != 0);

        final boolean disableRecent = ((disabledFlags & View.STATUS_BAR_DISABLE_RECENT) != 0);

        final boolean disableBack = ((disabledFlags & View.STATUS_BAR_DISABLE_BACK) != 0);

        final boolean disableBack = ((disabledFlags & View.STATUS_BAR_DISABLE_BACK) != 0)

                && ((mNavigationIconHints & StatusBarManager.NAVIGATION_HINT_BACK_ALT) == 0);

        final boolean disableSearch = ((disabledFlags & View.STATUS_BAR_DISABLE_SEARCH) != 0);



        if (SLIPPERY_WHEN_DISABLED) {