summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJoe Onorato <joeo@android.com>2010-06-09 14:47:43 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-06-09 14:47:43 -0700
commit1d46191d88ee9262ea05b868d2db5b44ad85fa43 (patch)
treee51b023ccc1a8d12075665dd06b824584f7afb57 /tests
parentfb3a35e586c08c74a8f9a0c332c9e40753c095c5 (diff)
parentb5f9b4f15a5cb060c34f1b8aa16cfee8503af0c7 (diff)
downloadframeworks_base-1d46191d88ee9262ea05b868d2db5b44ad85fa43.zip
frameworks_base-1d46191d88ee9262ea05b868d2db5b44ad85fa43.tar.gz
frameworks_base-1d46191d88ee9262ea05b868d2db5b44ad85fa43.tar.bz2
am b5f9b4f1: am 302759c1: Merge changes I4a11f027,Ib2c4abf6,Id0c7ef9f,I839d7771 into kraken
Diffstat (limited to 'tests')
-rw-r--r--tests/StatusBar/src/com/android/statusbartest/NotificationTestList.java13
1 files changed, 12 insertions, 1 deletions
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",