summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Onorato <joeo@android.com>2010-06-04 10:42:41 -0700
committerJoe Onorato <joeo@android.com>2010-06-09 09:15:25 -0700
commitd2b1f00e1e34cdce0047af7374aa57b1e4b5b040 (patch)
tree24d8b0b9971e44aa47fcb9e7b5e7eafb5493b237
parent55f8209da3048768a6dc24929dec8798e8ddf077 (diff)
downloadframeworks_base-d2b1f00e1e34cdce0047af7374aa57b1e4b5b040.zip
frameworks_base-d2b1f00e1e34cdce0047af7374aa57b1e4b5b040.tar.gz
frameworks_base-d2b1f00e1e34cdce0047af7374aa57b1e4b5b040.tar.bz2
Add some disabled logging and another test case for reapplying the notification views.
Change-Id: I839d7771ab42a5d508ce7d15385f6ac6a4e3be83
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/PhoneStatusBarService.java10
-rw-r--r--tests/StatusBar/src/com/android/statusbartest/NotificationTestList.java13
2 files changed, 22 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/PhoneStatusBarService.java b/packages/SystemUI/src/com/android/systemui/statusbar/PhoneStatusBarService.java
index e9ae69a..8c57ad6 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/PhoneStatusBarService.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/PhoneStatusBarService.java
@@ -349,6 +349,16 @@ public class PhoneStatusBarService extends StatusBarService {
final RemoteViews contentView = notification.notification.contentView;
+ if (false) {
+ Slog.d(TAG, "old notification: when=" + oldNotification.notification.when
+ + " ongoing=" + oldNotification.isOngoing()
+ + " expanded=" + oldEntry.expanded
+ + " contentView=" + oldContentView);
+ Slog.d(TAG, "new notification: when=" + notification.notification.when
+ + " ongoing=" + oldNotification.isOngoing()
+ + " contentView=" + contentView);
+ }
+
// Can we just reapply the RemoteViews in place? If when didn't change, the order
// didn't change.
if (notification.notification.when == oldNotification.notification.when
diff --git a/tests/StatusBar/src/com/android/statusbartest/NotificationTestList.java b/tests/StatusBar/src/com/android/statusbartest/NotificationTestList.java
index 3602fec..f96a079 100644
--- a/tests/StatusBar/src/com/android/statusbartest/NotificationTestList.java
+++ b/tests/StatusBar/src/com/android/statusbartest/NotificationTestList.java
@@ -44,6 +44,7 @@ public class NotificationTestList extends TestActivity
Vibrator mVibrator = new Vibrator();
Handler mHandler = new Handler();
+ long mActivityCreateTime = System.currentTimeMillis();
long mChronometerBase = 0;
@Override
@@ -421,7 +422,7 @@ public class NotificationTestList extends TestActivity
new Test("Persistent #1") {
public void run() {
Notification n = new Notification(R.drawable.icon1, "tick tick tick",
- System.currentTimeMillis());
+ mActivityCreateTime);
n.setLatestEventInfo(NotificationTestList.this, "Persistent #1",
"This is a notification!!!", makeIntent());
mNM.notify(1, n);
@@ -481,6 +482,16 @@ public class NotificationTestList extends TestActivity
}
},
+ new Test("Persistent #1 - different icon") {
+ public void run() {
+ Notification n = new Notification(R.drawable.icon2, null,
+ mActivityCreateTime);
+ n.setLatestEventInfo(NotificationTestList.this, "Persistent #1",
+ "This is the same notification!!!", makeIntent());
+ mNM.notify(1, n);
+ }
+ },
+
new Test("Chronometer Start") {
public void run() {
Notification n = new Notification(R.drawable.icon2, "me me me me",