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

Commit 0888ded3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Bouncer should dismiss if being tracked when face unlocked" into... 

Merge "Bouncer should dismiss if being tracked when face unlocked" into tm-d1-dev am: e12369e3 am: a6ace94f

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



Change-Id: I0a5d03b7191a9aab321b7201401ea4db0baf560a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 84d41a9b a6ace94f

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

+0 −4
Original line number Diff line number Diff line
@@ -400,10 +400,6 @@ public class KeyguardBouncer { 
        return mShowingSoon || mExpansion != EXPANSION_HIDDEN && mExpansion != EXPANSION_VISIBLE;

    }



    public boolean getShowingSoon() {

        return mShowingSoon;

    }



    /**

     * @return {@code true} when bouncer's pre-hide animation already started but isn't completely

     *         hidden yet, {@code false} otherwise.

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

+1 −1
Original line number Diff line number Diff line
@@ -965,7 +965,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 


    @Override

    public boolean bouncerIsOrWillBeShowing() {

        return isBouncerShowing() || mBouncer.getShowingSoon();

        return isBouncerShowing() || mBouncer.inTransit();

    }



    public boolean isFullscreenBouncer() {

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

+10 −0
Original line number Diff line number Diff line
@@ -388,6 +388,16 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase { 
        verify(mAlternateAuthInterceptor).hideAlternateAuthBouncer();

    }



    @Test

    public void testBouncerIsOrWillBeShowing_whenBouncerIsInTransit() {

        when(mBouncer.isShowing()).thenReturn(false);

        when(mBouncer.inTransit()).thenReturn(true);



        assertTrue(

                "Is or will be showing should be true when bouncer is in transit",

                mStatusBarKeyguardViewManager.bouncerIsOrWillBeShowing());

    }



    @Test

    public void testShowAltAuth_unlockingWithBiometricNotAllowed() {

        // GIVEN alt auth exists, unlocking with biometric isn't allowed