OSDN Git Service

Avoid unnecessary ticker animation if already visible.
authorJohn Spurlock <jspurlock@google.com>
Fri, 8 Nov 2013 21:56:54 +0000 (16:56 -0500)
committerJohn Spurlock <jspurlock@google.com>
Fri, 8 Nov 2013 22:00:05 +0000 (17:00 -0500)
When ticker disabled (e.g. on lockscreen) we should avoid
animating on halt if already halted.

Bug:11033324
Change-Id: Id2927d66492a128928b80ff98dc9182209be0652

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

index 607ce41..bbac4ef 100644 (file)
@@ -2105,9 +2105,12 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode {
         }
 
         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)
         }
     }