summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Onorato <joeo@google.com>2010-09-07 11:14:56 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-09-07 11:14:56 -0700
commit1f689f7e35464b1ccd3ce3307b6d92283ee1290d (patch)
tree291ec7683d79d30f6d362cc52372e7467445c9c3
parentb1104b3713febb75164938a465c3022e1879245f (diff)
parentda695520782a9feba963840aad596a20929396f2 (diff)
downloadframeworks_base-1f689f7e35464b1ccd3ce3307b6d92283ee1290d.zip
frameworks_base-1f689f7e35464b1ccd3ce3307b6d92283ee1290d.tar.gz
frameworks_base-1f689f7e35464b1ccd3ce3307b6d92283ee1290d.tar.bz2
Merge "When notifications are updated, don't re-show the ticker unless the text has changed." into gingerbread
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/StatusBarService.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarService.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarService.java
index 8f2da7a..af736aa 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarService.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarService.java
@@ -46,6 +46,7 @@ import android.os.Handler;
import android.os.Message;
import android.os.ServiceManager;
import android.os.SystemClock;
+import android.text.TextUtils;
import android.util.Slog;
import android.util.Log;
import android.view.Display;
@@ -462,7 +463,11 @@ public class StatusBarService extends Service implements CommandQueue.Callbacks
}
// Restart the ticker if it's still running
- tick(notification);
+ if (notification.notification.tickerText != null
+ && !TextUtils.equals(notification.notification.tickerText,
+ oldEntry.notification.notification.tickerText)) {
+ tick(notification);
+ }
// Recalculate the position of the sliding windows and the titles.
setAreThereNotifications();