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

Commit d916eed4 authored by bsears's avatar bsears Committed by Automerger Merge Worker
Browse files

Merge "Split up MODE_SHOW_BOUNCER and MODE_UNLOCK_COLLAPSING" into sc-dev am: 250a563f

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

Change-Id: I9afabf76f5d6ea2e7e2e8ad6f34f6607acefa945
parents 1a1e17c3 250a563f
Loading
Loading
Loading
Loading
+11 −2
Original line number Diff line number Diff line
@@ -411,13 +411,22 @@ public class BiometricUnlockController extends KeyguardUpdateMonitorCallback imp
                Trace.endSection();
                break;
            case MODE_UNLOCK_COLLAPSING:
                Trace.beginSection("MODE_UNLOCK_COLLAPSING");
                if (!wasDeviceInteractive) {
                    mPendingShowBouncer = true;
                } else {
                    showBouncer();
                    mKeyguardViewController.notifyKeyguardAuthenticated(
                            false /* strongAuth */);
                }
                Trace.endSection();
                break;
            case MODE_SHOW_BOUNCER:
                Trace.beginSection("MODE_UNLOCK_COLLAPSING or MODE_SHOW_BOUNCER");
                Trace.beginSection("MODE_SHOW_BOUNCER");
                if (!wasDeviceInteractive) {
                    mPendingShowBouncer = true;
                } else {
                    showBouncer();
                    mKeyguardViewController.notifyKeyguardAuthenticated(false /* strongAuth */);
                }
                Trace.endSection();
                break;
+2 −0
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ public class BiometricsUnlockControllerTest extends SysuiTestCase {
        verify(mStatusBarKeyguardViewManager).showBouncer(eq(false));
        verify(mShadeController).animateCollapsePanels(anyInt(), anyBoolean(), anyBoolean(),
                anyFloat());
        verify(mStatusBarKeyguardViewManager, never()).notifyKeyguardAuthenticated(anyBoolean());
        assertThat(mBiometricUnlockController.getMode())
                .isEqualTo(BiometricUnlockController.MODE_SHOW_BOUNCER);
    }
@@ -170,6 +171,7 @@ public class BiometricsUnlockControllerTest extends SysuiTestCase {
        verify(mStatusBarKeyguardViewManager, never()).showBouncer(anyBoolean());
        verify(mShadeController).animateCollapsePanels(anyInt(), anyBoolean(), anyBoolean(),
                anyFloat());
        verify(mStatusBarKeyguardViewManager).notifyKeyguardAuthenticated(eq(false));
        assertThat(mBiometricUnlockController.getMode())
                .isEqualTo(BiometricUnlockController.MODE_UNLOCK_COLLAPSING);
    }