Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I0ababa6b,I1a1ad69b into tm-dev am: 27a45d8ec3

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

Change-Id: I6daa729fb8d09005fa84ecbc54d450da257238f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-05-24 22:15:03 +00:00
committed by Automerger Merge Worker
parent 4b31535805 27a45d8ec3
commit 98a9953334
3 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3505,11 +3505,6 @@ public class CentralSurfacesImpl extends CoreStartable implements
@Override @Override
public void onTrackingStopped(boolean expand) { 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. // TODO: Figure out way to remove these.

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

@@ -479,12 +479,12 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
if (mBouncer == null) { if (mBouncer == null) {
return; return;
} }
mBouncer.hide(destroyView);
if (mShowing) { if (mShowing) {
// If we were showing the bouncer and then aborting, we need to also clear out any // If we were showing the bouncer and then aborting, we need to also clear out any
// potential actions unless we actually unlocked. // potential actions unless we actually unlocked.
cancelPostAuthActions(); cancelPostAuthActions();
} }
mBouncer.hide(destroyView);
cancelPendingWakeupAction(); cancelPendingWakeupAction();
} }

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

@@ -312,12 +312,27 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase {
mStatusBarKeyguardViewManager.dismissWithAction( mStatusBarKeyguardViewManager.dismissWithAction(
action, cancelAction, true /* afterKeyguardGone */); action, cancelAction, true /* afterKeyguardGone */);
when(mBouncer.isShowing()).thenReturn(false);
mStatusBarKeyguardViewManager.hideBouncer(true); mStatusBarKeyguardViewManager.hideBouncer(true);
mStatusBarKeyguardViewManager.hide(0, 30); mStatusBarKeyguardViewManager.hide(0, 30);
verify(action, never()).onDismiss(); verify(action, never()).onDismiss();
verify(cancelAction).run(); 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 @Test
public void testHiding_doesntCancelWhenShowing() { public void testHiding_doesntCancelWhenShowing() {
OnDismissAction action = mock(OnDismissAction.class); OnDismissAction action = mock(OnDismissAction.class);