always cancel animation if exist

CyanMobile · Mar 3, 2013 · 902e5c8 · 902e5c8
1 parent 2324a3e
commit 902e5c8
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/navbar/NavigationBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/navbar/NavigationBarView.java
@@ -1766,16 +1766,16 @@ private void setLowProfile(final boolean lightsOut, final boolean animate, final
 
         mLowProfile = lightsOut;
 
+        if (mNavViewAnim != null) mNavViewAnim.cancel();
+        if (mLightViewAnim != null) mLightViewAnim.cancel();
+
         if (!animate) {
             navButtons.setAlpha(lightsOut ? 0f : 1f);
 
             lowLights.setAlpha(lightsOut ? 1f : 0f);
             lowLights.setVisibility(lightsOut ? View.VISIBLE : View.GONE);
             if (lightsOut) lowLights.setOnTouchListener(mLightsOutListener);
         } else {
-            if (mNavViewAnim != null) mNavViewAnim.cancel();
-            if (mLightViewAnim != null) mLightViewAnim.cancel();
-
             mNavViewAnim = start(ObjectAnimator.ofFloat(navButtons, "alpha", lightsOut ? 1f : 0f, lightsOut ? 0f : 1f)
                                                .setDuration(lightsOut ? 600 : 200));