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

Merge "Revert "[Bouncer] ensure bouncer not shown with doze state."" into tm-qpr-dev

Browse Source
This commit is contained in:
Aaron Liu
2022-10-07 16:32:24 +00:00
committed by Android (Google) Code Review
parent a769b3d36d bbd23aef70
commit deb157936a
2 changed files with 0 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -733,11 +733,6 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
if (dozing || mBouncer.needsFullscreenBouncer() || mOccluded) { if (dozing || mBouncer.needsFullscreenBouncer() || mOccluded) {
reset(dozing /* hideBouncerWhenShowing */); reset(dozing /* hideBouncerWhenShowing */);
} }
if (bouncerIsOrWillBeShowing()) {
// Ensure bouncer is not shown when dozing state changes.
hideBouncer(false);
}
updateStates(); updateStates();
if (!dozing) { if (!dozing) {

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

@@ -23,11 +23,9 @@ import static org.mockito.ArgumentMatchers.anyFloat;
import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.clearInvocations; import static org.mockito.Mockito.clearInvocations;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never; import static org.mockito.Mockito.never;
import static org.mockito.Mockito.reset; import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
@@ -527,26 +525,4 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase {
mBouncerExpansionCallback.onVisibilityChanged(false); mBouncerExpansionCallback.onVisibilityChanged(false);
verify(mCentralSurfaces).setBouncerShowingOverDream(false); verify(mCentralSurfaces).setBouncerShowingOverDream(false);
} }
@Test
public void testSetDozing_bouncerShowing_Dozing() {
clearInvocations(mBouncer);
when(mBouncer.isShowing()).thenReturn(true);
doAnswer(invocation -> {
when(mBouncer.isShowing()).thenReturn(false);
return null;
}).when(mBouncer).hide(false);
mStatusBarKeyguardViewManager.onDozingChanged(true);
verify(mBouncer, times(1)).hide(false);
}
@Test
public void testSetDozing_bouncerShowing_notDozing() {
mStatusBarKeyguardViewManager.onDozingChanged(true);
when(mBouncer.isShowing()).thenReturn(true);
clearInvocations(mBouncer);
mStatusBarKeyguardViewManager.onDozingChanged(false);
verify(mBouncer, times(1)).hide(false);
}
} }