summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author John Spurlock <jspurlock@google.com> 2013-11-08 16:56:54 -0500
committer John Spurlock <jspurlock@google.com> 2013-11-08 17:00:05 -0500
commit26a08ac51a95bd71e1909d7b40d0e50f0d6bf243 (patch)
tree64280f0110fdb59d9fa564e5a57b063a4b570329
parent598a7aedfb6b77fc98bace9f420968a6f3ed637e (diff)
Avoid unnecessary ticker animation if already visible.
When ticker disabled (e.g. on lockscreen) we should avoid animating on halt if already halted. Bug:11033324 Change-Id: Id2927d66492a128928b80ff98dc9182209be0652
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java7
1 files changed, 5 insertions, 2 deletions
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 607ce416a05d..bbac4efcbd20 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 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)
}
}