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

Merge "Fix display fade-out animation" into rvc-dev am: a8dfb52c0f am: 57b1ad4193 am: e735df7944

Browse Source 
Change-Id: I1156530a4fe16047cff68fcd43b75ff416aa87e4
This commit is contained in:
Lucas Dupin
2020-03-24 02:29:28 +00:00
committed by Automerger Merge Worker
parent 9225c09cb5 e735df7944
commit 8b1e754294
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/doze/DozeScreenState.java
View File

@@ -92,7 +92,7 @@ public class DozeScreenState implements DozeMachine.Part {
final boolean pulseEnding = oldState == DOZE_PULSE_DONE && newState.isAlwaysOn(); final boolean pulseEnding = oldState == DOZE_PULSE_DONE && newState.isAlwaysOn();
final boolean turningOn = (oldState == DOZE_AOD_PAUSED || oldState == DOZE) final boolean turningOn = (oldState == DOZE_AOD_PAUSED || oldState == DOZE)
&& newState.isAlwaysOn(); && newState.isAlwaysOn();
final boolean turningOff = (newState.isAlwaysOn() && newState == DOZE) final boolean turningOff = (oldState.isAlwaysOn() && newState == DOZE)
|| (oldState == DOZE_AOD_PAUSING && newState == DOZE_AOD_PAUSED); || (oldState == DOZE_AOD_PAUSING && newState == DOZE_AOD_PAUSED);
final boolean justInitialized = oldState == DozeMachine.State.INITIALIZED; final boolean justInitialized = oldState == DozeMachine.State.INITIALIZED;
if (messagePending || justInitialized || pulseEnding || turningOn) { if (messagePending || justInitialized || pulseEnding || turningOn) {

16
packages/SystemUI/tests/src/com/android/systemui/doze/DozeScreenStateTest.java
View File

@@ -217,4 +217,20 @@ public class DozeScreenStateTest extends SysuiTestCase {
assertEquals(Display.STATE_OFF, mServiceFake.screenState); assertEquals(Display.STATE_OFF, mServiceFake.screenState);
} }
@Test
public void test_animatesOff() {
ArgumentCaptor<Runnable> captor = ArgumentCaptor.forClass(Runnable.class);
doAnswer(invocation -> null).when(mDozeHost).prepareForGentleSleep(captor.capture());
mHandlerFake.setMode(QUEUEING);
mScreen.transitionTo(UNINITIALIZED, INITIALIZED);
mScreen.transitionTo(INITIALIZED, DOZE_AOD);
mScreen.transitionTo(DOZE_AOD, DOZE);
mHandlerFake.dispatchQueuedMessages();
verify(mDozeHost).prepareForGentleSleep(eq(captor.getValue()));
captor.getValue().run();
assertEquals(Display.STATE_OFF, mServiceFake.screenState);
}
} }