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

Commit 710ca487 authored by Adrian Roos's avatar Adrian Roos Committed by android-build-merger
Browse files

Never show transient navigation bar when empty am: 1f425905

am: 794d684b

Change-Id: Idd985c9dcc61e1ea03385288541e195b8f91b757
parents 13129f65 794d684b
Loading
Loading
Loading
Loading
+8 −3
Original line number Diff line number Diff line
@@ -6185,9 +6185,11 @@ public class PhoneWindowManager implements WindowManagerPolicy {
                    return;
                }
                mPendingPanicGestureUptime = SystemClock.uptimeMillis();
                if (!isNavBarEmpty(mLastSystemUiFlags)) {
                    mNavigationBarController.showTransient();
                }
            }
        }
    };

    private void requestTransientBars(WindowState swipeTarget) {
@@ -6197,7 +6199,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {
                return;
            }
            boolean sb = mStatusBarController.checkShowTransientBarLw();
            boolean nb = mNavigationBarController.checkShowTransientBarLw();
            boolean nb = mNavigationBarController.checkShowTransientBarLw()
                    && !isNavBarEmpty(mLastSystemUiFlags);
            if (sb || nb) {
                // Don't show status bar when swiping on already visible navigation bar
                if (!nb && swipeTarget == mNavigationBar) {
@@ -7551,8 +7554,10 @@ public class PhoneWindowManager implements WindowManagerPolicy {
            // we're no longer on the Keyguard and the screen is ready. We can now request the bars.
            mPendingPanicGestureUptime = 0;
            mStatusBarController.showTransient();
            if (!isNavBarEmpty(vis)) {
                mNavigationBarController.showTransient();
            }
        }

        final boolean denyTransientStatus = mStatusBarController.isTransientShowRequested()
                && !transientStatusBarAllowed && hideStatusBarSysui;