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

Commit 3938886f authored by Lucas Silva's avatar Lucas Silva Committed by Automerger Merge Worker
Browse files

Merge "Don't hide the bouncer when resetting keyguard if keyguard is already... 

Merge "Don't hide the bouncer when resetting keyguard if keyguard is already showing." into udc-dev am: e5040c84 am: af4f048a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22645974



Change-Id: I5bef7f1bc7415aa184a40ce09d759b99c809b739
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5f6e5433 af4f048a

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+11 −6
Original line number Diff line number Diff line
@@ -1965,11 +1965,12 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, 
        if (mShowing && mKeyguardStateController.isShowing()) {

            if (mPM.isInteractive() && !mHiding) {

                // It's already showing, and we're not trying to show it while the screen is off.

                // We can simply reset all of the views.

                // We can simply reset all of the views, but don't hide the bouncer in case the user

                // is currently interacting with it.

                if (DEBUG) Log.d(TAG, "doKeyguard: not showing (instead, resetting) because it is "

                        + "already showing, we're interactive, and we were not previously hiding. "

                        + "It should be safe to short-circuit here.");

                resetStateLocked();

                resetStateLocked(/* hideBouncer= */ false);

                return;

            } else {

                // We are trying to show the keyguard while the screen is off or while we were in
@@ -2043,8 +2044,12 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, 
     * @see #handleReset

     */

    private void resetStateLocked() {

        resetStateLocked(/* hideBouncer= */ true);

    }



    private void resetStateLocked(boolean hideBouncer) {

        if (DEBUG) Log.e(TAG, "resetStateLocked");

        Message msg = mHandler.obtainMessage(RESET);

        Message msg = mHandler.obtainMessage(RESET, hideBouncer ? 1 : 0, 0);

        mHandler.sendMessage(msg);

    }
@@ -2234,7 +2239,7 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, 
                    handleHide();

                    break;

                case RESET:

                    handleReset();

                    handleReset(msg.arg1 != 0);

                    break;

                case VERIFY_UNLOCK:

                    Trace.beginSection("KeyguardViewMediator#handleMessage VERIFY_UNLOCK");
@@ -3014,10 +3019,10 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, 
     * Handle message sent by {@link #resetStateLocked}

     * @see #RESET

     */

    private void handleReset() {

    private void handleReset(boolean hideBouncer) {

        synchronized (KeyguardViewMediator.this) {

            if (DEBUG) Log.d(TAG, "handleReset");

            mKeyguardViewControllerLazy.get().reset(true /* hideBouncerWhenShowing */);

            mKeyguardViewControllerLazy.get().reset(hideBouncer);

        }



        scheduleNonStrongBiometricIdleTimeout();

packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardViewMediatorTest.java

+1 −1
Original line number Diff line number Diff line
@@ -514,7 +514,7 @@ public class KeyguardViewMediatorTest extends SysuiTestCase { 
        TestableLooper.get(this).processAllMessages();



        assertTrue(mViewMediator.isShowingAndNotOccluded());

        verify(mStatusBarKeyguardViewManager).reset(anyBoolean());

        verify(mStatusBarKeyguardViewManager).reset(false);

    }



    @Test