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

Revert "[Bouncer] reset bouncer visibility with doze state."

Browse Source 
This reverts commit 590051205d.

Reason for revert: Causing other issues an cts failures

Change-Id: I53b5a824ef751dd6764cd5780f253e3c599f9d51
This commit is contained in:
Aaron Liu
2022-09-30 16:58:45 +00:00
parent 590051205d
commit 7f4d21f990
2 changed files with 3 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -667,7 +667,9 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
private void setDozing(boolean dozing) {
if (mDozing != dozing) {
mDozing = dozing;
reset(true /* hideBouncerWhenShowing */);
if (dozing || mBouncer.needsFullscreenBouncer() || mOccluded) {
reset(dozing /* hideBouncerWhenShowing */);
}
updateStates();
if (!dozing) {

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

@@ -26,7 +26,6 @@ import static org.mockito.Mockito.clearInvocations;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -506,21 +505,4 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase {
mBouncerExpansionCallback.onVisibilityChanged(false);
verify(mCentralSurfaces).setBouncerShowingOverDream(false);
}
@Test
public void testSetDozing_Dozing() {
clearInvocations(mBouncer);
mStatusBarKeyguardViewManager.onDozingChanged(true);
// Once when shown and once with dozing changed.
verify(mBouncer, times(1)).hide(false);
}
@Test
public void testSetDozing_notDozing() {
mStatusBarKeyguardViewManager.onDozingChanged(true);
clearInvocations(mBouncer);
mStatusBarKeyguardViewManager.onDozingChanged(false);
// Once when shown and twice with dozing changed.
verify(mBouncer, times(1)).hide(false);
}
}