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

Commit 451b1b6d 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: e1f7db92

Change-Id: Ia6decd28973d4c55bbb26fc97403357940386945
parents f92250ba e1f7db92

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

+5 −0
Original line number Original line 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.

        // Always disable recents when alternate car mode UI is active and for secondary displays.

        boolean disableRecent = isRecentsButtonDisabled();

        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)

        boolean disableBack = !useAltBack && (isGesturalMode(mNavBarMode)

                || ((mDisabledFlags & View.STATUS_BAR_DISABLE_BACK) != 0));

                || ((mDisabledFlags & View.STATUS_BAR_DISABLE_BACK) != 0));
@@ -649,6 +653,7 @@ public class NavigationBarView extends FrameLayout implements 
        getBackButton().setVisibility(disableBack      ? View.INVISIBLE : View.VISIBLE);

        getBackButton().setVisibility(disableBack      ? View.INVISIBLE : View.VISIBLE);

        getHomeButton().setVisibility(disableHome      ? View.INVISIBLE : View.VISIBLE);

        getHomeButton().setVisibility(disableHome      ? View.INVISIBLE : View.VISIBLE);

        getRecentsButton().setVisibility(disableRecent ? View.INVISIBLE : View.VISIBLE);

        getRecentsButton().setVisibility(disableRecent ? View.INVISIBLE : View.VISIBLE);

        getHomeHandle().setVisibility(disableHomeHandle ? View.INVISIBLE : View.VISIBLE);

    }

    }





    @VisibleForTesting

    @VisibleForTesting