Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix occasional re-posting of ticker text.

Browse Source 
Bug: 6992707
Change-Id: Ib289d742c2fb24d2c201d597349fa86ad8ce4a28
This commit is contained in:
Daniel Sandler
2012-09-28 15:33:14 -04:00
parent 0dc2b81ce1
commit f59a90c247
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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)
}
}