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

Commit 0a790fe5 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fixed an issue where using UDFPS always dismissed the shade" into sc-qpr1-dev am: bd69c2fd 

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

Change-Id: I438a81985e9bfe6ff3a2e3006d31a59466685894
parents 939d307e bd69c2fd

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

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


    @Override

    public boolean bouncerIsOrWillBeShowing() {

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

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

    }



    public boolean isFullscreenBouncer() {

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

+20 −0
Original line number Diff line number Diff line
@@ -102,6 +102,8 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase { 
    @Mock

    private UnlockedScreenOffAnimationController mUnlockedScreenOffAnimationController;

    @Mock

    private StatusBarKeyguardViewManager.AlternateAuthInterceptor mAlternateAuthInterceptor;

    @Mock

    private KeyguardMessageArea mKeyguardMessageArea;



    private WakefulnessLifecycle mWakefulnessLifecycle;
@@ -286,6 +288,24 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase { 
        verify(cancelAction, never()).run();

    }



    @Test

    public void testShowing_whenAlternateAuthShowing() {

        mStatusBarKeyguardViewManager.setAlternateAuthInterceptor(mAlternateAuthInterceptor);

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

        when(mAlternateAuthInterceptor.isShowingAlternateAuthBouncer()).thenReturn(true);

        assertTrue("Is showing not accurate when alternative auth showing",

                mStatusBarKeyguardViewManager.isShowing());

    }



    @Test

    public void testWillBeShowing_whenAlternateAuthShowing() {

        mStatusBarKeyguardViewManager.setAlternateAuthInterceptor(mAlternateAuthInterceptor);

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

        when(mAlternateAuthInterceptor.isShowingAlternateAuthBouncer()).thenReturn(true);

        assertTrue("Is or will be showing not accurate when alternative auth showing",

                mStatusBarKeyguardViewManager.bouncerIsOrWillBeShowing());

    }



    @Test

    public void testUpdateResources_delegatesToBouncer() {

        mStatusBarKeyguardViewManager.updateResources();