commit e8107cf358bd3b56720fd2dab424566f75e422aa
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Aug 03 12:34:59 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 03 12:34:59 2017 +0000
tree b7a605adce2995a1fe279692fb156f2a6a376917
parent 6a2ee3b1804f6df19c0b22203f2149b365659339
parent 013fc4c5e12aa691b2c83f1f869d220bf0f45e08

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

packages/SystemUI/src/com/android/systemui/doze/DozeUi.java

diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeUi.java b/packages/SystemUI/src/com/android/systemui/doze/DozeUi.java
index 8847452..dc626fb 100644
--- a/packages/SystemUI/src/com/android/systemui/doze/DozeUi.java
+++ b/packages/SystemUI/src/com/android/systemui/doze/DozeUi.java
@@ -95,17 +95,22 @@
                 unscheduleTimeTick();
                 break;
         }
-        mHost.setAnimateWakeup(shouldAnimateWakeup(newState));
+        updateAnimateWakeup(newState);
     }
 
-    private boolean shouldAnimateWakeup(DozeMachine.State state) {
+    private void updateAnimateWakeup(DozeMachine.State state) {
         switch (state) {
             case DOZE_REQUEST_PULSE:
             case DOZE_PULSING:
             case DOZE_PULSE_DONE:
-                return true;
+                mHost.setAnimateWakeup(true);
+                break;
+            case FINISH:
+                // Keep current state.
+                break;
             default:
-                return false;
+                mHost.setAnimateWakeup(false);
+                break;
         }
     }