From f59a90c24788d6d67a492aa5a9d8efbf350bbd7e Mon Sep 17 00:00:00 2001
From: Daniel Sandler <dsandler@android.com>
Date: Fri, 28 Sep 2012 15:33:14 -0400
Subject: [PATCH] Fix occasional re-posting of ticker text.

Bug: 6992707
Change-Id: Ib289d742c2fb24d2c201d597349fa86ad8ce4a28
---
 .../android/systemui/statusbar/phone/PhoneStatusBar.java | 9 ++++-----
 1 file changed, 4 insertions(+), 5 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 508835f61d695..78001e39fa7c4 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -1072,7 +1072,7 @@ public class PhoneStatusBar extends BaseStatusBar {
         if ((diff & StatusBarManager.DISABLE_NOTIFICATION_ICONS) != 0) {
             if ((state & StatusBarManager.DISABLE_NOTIFICATION_ICONS) != 0) {
                 if (mTicking) {
-                    mTicker.halt();
+                    haltTicker();
                 }
 
                 mNotificationIcons.animate()
@@ -1094,7 +1094,7 @@ public class PhoneStatusBar extends BaseStatusBar {
             }
         } else if ((diff & StatusBarManager.DISABLE_NOTIFICATION_TICKER) != 0) {
             if (mTicking && (state & StatusBarManager.DISABLE_NOTIFICATION_TICKER) != 0) {
-                mTicker.halt();
+                haltTicker();
             }
         }
     }
@@ -1358,7 +1358,7 @@ public class PhoneStatusBar extends BaseStatusBar {
                 if (lightsOut) {
                     animateCollapsePanels();
                     if (mTicking) {
-                        mTicker.halt();
+                        haltTicker();
                     }
                 }
 
@@ -1488,8 +1488,7 @@ public class PhoneStatusBar extends BaseStatusBar {
             mStatusBarContents.setVisibility(View.VISIBLE);
             mTickerView.setVisibility(View.GONE);
             mStatusBarContents.startAnimation(loadAnim(com.android.internal.R.anim.fade_in, null));
-            mTickerView.startAnimation(loadAnim(com.android.internal.R.anim.fade_out,
-                        mTickingDoneListener));
+            // we do not animate the ticker away at this point, just get rid of it (b/6992707)
         }
     }