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

Merge "Prevent bouncer from showing during unlock animation" into udc-dev

Browse Source
This commit is contained in:
Treehugger Robot
2023-05-26 19:59:04 +00:00
committed by Android (Google) Code Review
parent 1fe8b30f0f a3c0630095
commit 557775c493
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -495,6 +495,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
return mKeyguardStateController.isShowing() return mKeyguardStateController.isShowing()
&& !primaryBouncerIsOrWillBeShowing() && !primaryBouncerIsOrWillBeShowing()
&& !mKeyguardStateController.isKeyguardGoingAway()
&& isUserTrackingStarted && isUserTrackingStarted
&& !hideBouncerOverDream && !hideBouncerOverDream
&& !mKeyguardStateController.isOccluded() && !mKeyguardStateController.isOccluded()

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

@@ -351,6 +351,17 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase {
verify(mPrimaryBouncerInteractor, never()).setPanelExpansion(anyFloat()); verify(mPrimaryBouncerInteractor, never()).setPanelExpansion(anyFloat());
} }
@Test
public void onPanelExpansionChanged_neverTranslatesBouncerWhenGoingAway() {
when(mKeyguardStateController.isKeyguardGoingAway()).thenReturn(true);
mStatusBarKeyguardViewManager.onPanelExpansionChanged(
expansionEvent(
/* fraction= */ EXPANSION_VISIBLE,
/* expanded= */ true,
/* tracking= */ false));
verify(mPrimaryBouncerInteractor, never()).setPanelExpansion(anyFloat());
}
@Test @Test
public void onPanelExpansionChanged_neverTranslatesBouncerWhenShowBouncer() { public void onPanelExpansionChanged_neverTranslatesBouncerWhenShowBouncer() {
// Since KeyguardBouncer.EXPANSION_VISIBLE = 0 panel expansion, if the unlock is dismissing // Since KeyguardBouncer.EXPANSION_VISIBLE = 0 panel expansion, if the unlock is dismissing