Skip to content

Commit f59a90c

Browse files
committed
Fix occasional re-posting of ticker text.
Bug: 6992707 Change-Id: Ib289d742c2fb24d2c201d597349fa86ad8ce4a28
1 parent 0dc2b81 commit f59a90c

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1072,7 +1072,7 @@ public void disable(int state) {
10721072
if ((diff & StatusBarManager.DISABLE_NOTIFICATION_ICONS) != 0) {
10731073
if ((state & StatusBarManager.DISABLE_NOTIFICATION_ICONS) != 0) {
10741074
if (mTicking) {
1075-
mTicker.halt();
1075+
haltTicker();
10761076
}
10771077

10781078
mNotificationIcons.animate()
@@ -1094,7 +1094,7 @@ public void disable(int state) {
10941094
}
10951095
} else if ((diff & StatusBarManager.DISABLE_NOTIFICATION_TICKER) != 0) {
10961096
if (mTicking && (state & StatusBarManager.DISABLE_NOTIFICATION_TICKER) != 0) {
1097-
mTicker.halt();
1097+
haltTicker();
10981098
}
10991099
}
11001100
}
@@ -1358,7 +1358,7 @@ public void setSystemUiVisibility(int vis, int mask) {
13581358
if (lightsOut) {
13591359
animateCollapsePanels();
13601360
if (mTicking) {
1361-
mTicker.halt();
1361+
haltTicker();
13621362
}
13631363
}
13641364

@@ -1488,8 +1488,7 @@ public void tickerHalting() {
14881488
mStatusBarContents.setVisibility(View.VISIBLE);
14891489
mTickerView.setVisibility(View.GONE);
14901490
mStatusBarContents.startAnimation(loadAnim(com.android.internal.R.anim.fade_in, null));
1491-
mTickerView.startAnimation(loadAnim(com.android.internal.R.anim.fade_out,
1492-
mTickingDoneListener));
1491+
// we do not animate the ticker away at this point, just get rid of it (b/6992707)
14931492
}
14941493
}
14951494

0 commit comments

Comments
 (0)