commit 21e8f419a8b92b700237404b4c69d2aa601dcba6
author Jorim Jaggi <jjaggi@google.com> Wed Aug 27 15:04:33 2014 +0200
committer Jorim Jaggi <jjaggi@google.com> Wed Aug 27 16:56:49 2014 +0200
tree 619701d96d9531f19cab1427e6e5ba6228ec3650
parent 473119fdc36340f833e4b755ae7f50a6914e0a24

Fix missing status bar icons

Bug: 16481924
Change-Id: I7df734519d112e2b0240f87940f9350bef5ea9df

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
index 620d3ec..4159447 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -2015,7 +2015,12 @@
                 .alpha(1f)
                 .setDuration(320)
                 .setInterpolator(ALPHA_IN)
-                .setStartDelay(50);
+                .setStartDelay(50)
+
+                // We need to clean up any pending end action from animateStatusBarHide if we call
+                // both hide and show in the same frame before the animation actually gets started.
+                // cancel() doesn't really remove the end action.
+                .withEndAction(null);
 
         // Synchronize the motion with the Keyguard fading if necessary.
         if (mKeyguardFadingAway) {