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

Commit ec30fd51 authored by Sunny Goyal's avatar Sunny Goyal Committed by android-build-team Robot
Browse files

Hide the home handle in lock task home when home and overview are disabled

Bug: 137626984
Test: Verified the home handle is hidden with CtsVerifier app
Change-Id: I0c21ae5b6f0d094e84b2ba4200a93fd9c4295a55
(cherry picked from commit be4e054c)
parent ea62a122
Loading
Loading
Loading
Loading
+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