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

Merge "Revert "[Bouncer] reset bouncer visibility with doze state."" into tm-qpr-dev am: 1c9f712956 am: 39e076bb4b

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

Change-Id: I391161aeb6cb9cf83340128dd26bb5a41d8f6c88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-09-30 19:50:14 +00:00
committed by Automerger Merge Worker
parent b85b63d746 39e076bb4b
commit 44d1af827f
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

@@ -732,7 +732,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;
@@ -526,21 +525,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);
}
}