commit ed7376fc4829e93f5f2d3037633a37d652a13a7c
author Jim Miller <jaggies@google.com> Sat Nov 09 00:22:07 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Nov 09 00:22:08 2013 +0000
tree dbca75c683d4e8910e4d14d80411f8fb445ac5f5
parent 105b9b05041ea6f1109d961d548f3dde2bd69501
parent 505329b21b743c6e74e0d1b14bea78a22f7b4145

Merge "Restore permission check in keyguard." into klp-dev

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 607ce41..bbac4ef 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -2105,9 +2105,12 @@
         }
 
         public void tickerHalting() {
-            mStatusBarContents.setVisibility(View.VISIBLE);
+            if (mStatusBarContents.getVisibility() != View.VISIBLE) {
+                mStatusBarContents.setVisibility(View.VISIBLE);
+                mStatusBarContents
+                        .startAnimation(loadAnim(com.android.internal.R.anim.fade_in, null));
+            }
             mTickerView.setVisibility(View.GONE);
-            mStatusBarContents.startAnimation(loadAnim(com.android.internal.R.anim.fade_in, null));
             // we do not animate the ticker away at this point, just get rid of it (b/6992707)
         }
     }