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

Commit 7f3e2ab6 authored by Lucas Dupin's avatar Lucas Dupin Committed by android-build-merger
Browse files

Merge "Bouncer shouldn't be translated when occluded" into pi-dev am: 553fc8b8 

am: 76bb2c0b

Change-Id: Ibd5f92d3e11a28c1d7dbecbf4e702ccc0e294ba8
parents fceae320 76bb2c0b

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

+1 −1
Original line number Original line 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,

            // Bouncer needs the front scrim when it's on top of an activity,

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

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

            // FLAG_DISMISS_KEYGUARD_ACTIVITY.

            // FLAG_DISMISS_KEYGUARD_ACTIVITY.

            ScrimState state = mStatusBarKeyguardViewManager.bouncerNeedsScrimming()

            ScrimState state = mIsOccluded || mStatusBarKeyguardViewManager.bouncerNeedsScrimming()

                    || mStatusBarKeyguardViewManager.willDismissWithAction()

                    || mStatusBarKeyguardViewManager.willDismissWithAction()

                    || mStatusBarKeyguardViewManager.isFullscreenBouncer() ?

                    || mStatusBarKeyguardViewManager.isFullscreenBouncer() ?

                    ScrimState.BOUNCER_SCRIMMED : ScrimState.BOUNCER;

                    ScrimState.BOUNCER_SCRIMMED : ScrimState.BOUNCER;

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

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

        // • Full-screen user switcher is displayed.

        if (mNotificationPanelView.isUnlockHintRunning()) {

        if (mNotificationPanelView.isUnlockHintRunning()) {

            mBouncer.setExpansion(KeyguardBouncer.EXPANSION_HIDDEN);

            mBouncer.setExpansion(KeyguardBouncer.EXPANSION_HIDDEN);

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

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

                || mStatusBar.isFullScreenUserSwitcherState()) {

                || mStatusBar.isFullScreenUserSwitcherState()) {

            mBouncer.setExpansion(KeyguardBouncer.EXPANSION_VISIBLE);

            mBouncer.setExpansion(KeyguardBouncer.EXPANSION_VISIBLE);

        } else if (mShowing && !mDozing) {

        } else if (mShowing && !mDozing) {

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

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

        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 {

    private class TestableStatusBarKeyguardViewManager extends StatusBarKeyguardViewManager {





        public TestableStatusBarKeyguardViewManager(Context context,

        public TestableStatusBarKeyguardViewManager(Context context,