From 26a08ac51a95bd71e1909d7b40d0e50f0d6bf243 Mon Sep 17 00:00:00 2001 From: John Spurlock Date: Fri, 8 Nov 2013 16:56:54 -0500 Subject: [PATCH] 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 --- .../android/systemui/statusbar/phone/PhoneStatusBar.java | 7 +++++-- 1 file 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 607ce416a05df..bbac4efcbd209 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) } }