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

Commit af4f048a 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

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



Change-Id: If8e09e8c43eda02ed5946a1d255c5805de2da970
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bf02b04c e5040c84

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

+11 −6
Original line number Diff line number Diff line
@@ -1957,11 +1957,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
@@ -2035,8 +2036,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);

    }
@@ -2226,7 +2231,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");
@@ -3008,10 +3013,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
@@ -502,7 +502,7 @@ public class KeyguardViewMediatorTest extends SysuiTestCase { 
        TestableLooper.get(this).processAllMessages();



        assertTrue(mViewMediator.isShowingAndNotOccluded());

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

        verify(mStatusBarKeyguardViewManager).reset(false);

    }



    @Test