diff options
| author | John Spurlock <jspurlock@google.com> | 2013-11-08 23:00:30 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-11-08 23:00:31 +0000 |
| commit | 105b9b05041ea6f1109d961d548f3dde2bd69501 (patch) | |
| tree | a95e80638307a9fc69db767ffdb781da4fb44ef3 /packages/SystemUI | |
| parent | a5c5fa308918791a76a149e0768c8cbfc18d1778 (diff) | |
| parent | 26a08ac51a95bd71e1909d7b40d0e50f0d6bf243 (diff) | |
| download | frameworks_base-105b9b05041ea6f1109d961d548f3dde2bd69501.zip frameworks_base-105b9b05041ea6f1109d961d548f3dde2bd69501.tar.gz frameworks_base-105b9b05041ea6f1109d961d548f3dde2bd69501.tar.bz2 | |
Merge "Avoid unnecessary ticker animation if already visible." into klp-dev
Diffstat (limited to 'packages/SystemUI')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java | 7 |
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 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 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) } } |