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

Commit 27a45d8e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I0ababa6b,I1a1ad69b into tm-dev 

* changes:
  Run cancelAction if bouncer is canceled
  Fix bouncer flicker on lockscreen shade transition
parents 4d6f7317 1de97986

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

+0 −6
Original line number Diff line number Diff line
@@ -107,7 +107,6 @@ import android.view.WindowManager; 
import android.view.WindowManagerGlobal;

import android.view.accessibility.AccessibilityManager;

import android.widget.DateTimeView;

import android.window.SplashScreen;



import androidx.annotation.NonNull;

import androidx.lifecycle.Lifecycle;
@@ -3508,11 +3507,6 @@ public class CentralSurfacesImpl extends CoreStartable implements 


    @Override

    public void onTrackingStopped(boolean expand) {

        if (mState == StatusBarState.KEYGUARD || mState == StatusBarState.SHADE_LOCKED) {

            if (!expand && !mKeyguardStateController.canDismissLockScreen()) {

                mStatusBarKeyguardViewManager.showBouncer(false /* scrimmed */);

            }

        }

    }



    // TODO: Figure out way to remove these.

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

+1 −1
Original line number Diff line number Diff line
@@ -480,12 +480,12 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
        if (mBouncer == null) {

            return;

        }

        mBouncer.hide(destroyView);

        if (mShowing) {

            // If we were showing the bouncer and then aborting, we need to also clear out any

            // potential actions unless we actually unlocked.

            cancelPostAuthActions();

        }

        mBouncer.hide(destroyView);

        cancelPendingWakeupAction();

    }

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

+15 −0
Original line number Diff line number Diff line
@@ -312,12 +312,27 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase { 
        mStatusBarKeyguardViewManager.dismissWithAction(

                action, cancelAction, true /* afterKeyguardGone */);



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

        mStatusBarKeyguardViewManager.hideBouncer(true);

        mStatusBarKeyguardViewManager.hide(0, 30);

        verify(action, never()).onDismiss();

        verify(cancelAction).run();

    }



    @Test

    public void testHidingBouncer_cancelsGoneRunnable() {

        OnDismissAction action = mock(OnDismissAction.class);

        Runnable cancelAction = mock(Runnable.class);

        mStatusBarKeyguardViewManager.dismissWithAction(

                action, cancelAction, true /* afterKeyguardGone */);



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

        mStatusBarKeyguardViewManager.hideBouncer(true);



        verify(action, never()).onDismiss();

        verify(cancelAction).run();

    }



    @Test

    public void testHiding_doesntCancelWhenShowing() {

        OnDismissAction action = mock(OnDismissAction.class);