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

Commit 8213f7d9 authored by Sunny Goyal's avatar Sunny Goyal Committed by android-build-merger
Browse files

Merge "Hide the home handle in lock task home when home and overview are...

Merge "Hide the home handle in lock task home when home and overview are disabled" into qt-r1-dev am: 2862d538
am: ffe8886c

Change-Id: I0533a8804ae6214708ded44cb3cbe030dca76aaa
parents 2d6b8566 ffe8886c
Loading
Loading
Loading
Loading
+5 −0
Original line number Diff line number Diff line
@@ -619,6 +619,10 @@ public class NavigationBarView extends FrameLayout implements
        // Always disable recents when alternate car mode UI is active and for secondary displays.
        boolean disableRecent = isRecentsButtonDisabled();

        // Disable the home handle if both hone and recents are disabled
        boolean disableHomeHandle = disableRecent
                && ((mDisabledFlags & View.STATUS_BAR_DISABLE_HOME) != 0);

        boolean disableBack = !useAltBack && (isGesturalMode(mNavBarMode)
                || ((mDisabledFlags & View.STATUS_BAR_DISABLE_BACK) != 0));

@@ -649,6 +653,7 @@ public class NavigationBarView extends FrameLayout implements
        getBackButton().setVisibility(disableBack      ? View.INVISIBLE : View.VISIBLE);
        getHomeButton().setVisibility(disableHome      ? View.INVISIBLE : View.VISIBLE);
        getRecentsButton().setVisibility(disableRecent ? View.INVISIBLE : View.VISIBLE);
        getHomeHandle().setVisibility(disableHomeHandle ? View.INVISIBLE : View.VISIBLE);
    }

    @VisibleForTesting