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

Commit 553fc8b8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Bouncer shouldn't be translated when occluded" into pi-dev

parents 322d934e aece5028

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

+1 −1
Original line number Diff line number Diff line
@@ -4715,7 +4715,7 @@ public class StatusBar extends SystemUI implements DemoMode, 
            // Bouncer needs the front scrim when it's on top of an activity,

            // tapping on a notification, editing QS or being dismissed by

            // FLAG_DISMISS_KEYGUARD_ACTIVITY.

            ScrimState state = mStatusBarKeyguardViewManager.bouncerNeedsScrimming()

            ScrimState state = mIsOccluded || mStatusBarKeyguardViewManager.bouncerNeedsScrimming()

                    || mStatusBarKeyguardViewManager.willDismissWithAction()

                    || mStatusBarKeyguardViewManager.isFullscreenBouncer() ?

                    ScrimState.BOUNCER_SCRIMMED : ScrimState.BOUNCER;

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

+1 −1
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
        // • Full-screen user switcher is displayed.

        if (mNotificationPanelView.isUnlockHintRunning()) {

            mBouncer.setExpansion(KeyguardBouncer.EXPANSION_HIDDEN);

        } else if (mBouncer.willDismissWithAction() || mBouncer.isShowingScrimmed()

        } else if (mOccluded || mBouncer.willDismissWithAction() || mBouncer.isShowingScrimmed()

                || mStatusBar.isFullScreenUserSwitcherState()) {

            mBouncer.setExpansion(KeyguardBouncer.EXPANSION_VISIBLE);

        } else if (mShowing && !mDozing) {

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest.java

+8 −0
Original line number Diff line number Diff line
@@ -162,6 +162,14 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase { 
        verify(mBouncer, never()).show(eq(false), eq(false));

    }



    @Test

    public void onPanelExpansionChanged_neverTranslatesBouncerWhenOccluded() {

        mStatusBarKeyguardViewManager.setOccluded(true /* occluded */, false /* animate */);

        mStatusBarKeyguardViewManager.onPanelExpansionChanged(0.5f /* expansion */,

                true /* tracking */);

        verify(mBouncer, never()).setExpansion(eq(0.5f));

    }



    private class TestableStatusBarKeyguardViewManager extends StatusBarKeyguardViewManager {



        public TestableStatusBarKeyguardViewManager(Context context,