Merge "AOD: Do not change wakeup animation during DozeService teardown" into oc-dr1-dev

am: e8107cf358

Change-Id: I2042c1d15844e34929286e91283ddb9942faea8f
This commit is contained in:
Adrian Roos
2017-08-03 12:48:38 +00:00
committed by android-build-merger

View File

@@ -95,17 +95,22 @@ public class DozeUi implements DozeMachine.Part {
unscheduleTimeTick(); unscheduleTimeTick();
break; break;
} }
mHost.setAnimateWakeup(shouldAnimateWakeup(newState)); updateAnimateWakeup(newState);
} }
private boolean shouldAnimateWakeup(DozeMachine.State state) { private void updateAnimateWakeup(DozeMachine.State state) {
switch (state) { switch (state) {
case DOZE_REQUEST_PULSE: case DOZE_REQUEST_PULSE:
case DOZE_PULSING: case DOZE_PULSING:
case DOZE_PULSE_DONE: case DOZE_PULSE_DONE:
return true; mHost.setAnimateWakeup(true);
break;
case FINISH:
// Keep current state.
break;
default: default:
return false; mHost.setAnimateWakeup(false);
break;
} }
} }