summaryrefslogtreecommitdiffstats
path: root/tests/StatusBar
diff options
context:
space:
mode:
authorJoe Onorato <joeo@google.com>2011-01-15 16:22:24 -0800
committerJoe Onorato <joeo@google.com>2011-01-15 16:22:24 -0800
commit80a44401a22344f7eabce6976372ab144ef22893 (patch)
treeb13a229ef7c79e0d98feeb337359f1d060ad0e79 /tests/StatusBar
parenta47aa87a19c733e28d9d2db1c4eb7f29d668db7b (diff)
downloadframeworks_base-80a44401a22344f7eabce6976372ab144ef22893.zip
frameworks_base-80a44401a22344f7eabce6976372ab144ef22893.tar.gz
frameworks_base-80a44401a22344f7eabce6976372ab144ef22893.tar.bz2
Need to update the largeIcon for notifications when we're reapplying the views.
Bug: 3298062 Change-Id: I6bb72c0b93e00a9de8cc2633ac07add0a572a20f
Diffstat (limited to 'tests/StatusBar')
-rw-r--r--tests/StatusBar/res/drawable-mdpi/pineapple2.pngbin0 -> 11577 bytes
-rw-r--r--tests/StatusBar/res/layout/notification_builder_test.xml7
-rw-r--r--tests/StatusBar/src/com/android/statusbartest/NotificationBuilderTest.java13
3 files changed, 18 insertions, 2 deletions
diff --git a/tests/StatusBar/res/drawable-mdpi/pineapple2.png b/tests/StatusBar/res/drawable-mdpi/pineapple2.png
new file mode 100644
index 0000000..ddc1038
--- /dev/null
+++ b/tests/StatusBar/res/drawable-mdpi/pineapple2.png
Binary files differ
diff --git a/tests/StatusBar/res/layout/notification_builder_test.xml b/tests/StatusBar/res/layout/notification_builder_test.xml
index 1b27e97..3c37a73 100644
--- a/tests/StatusBar/res/layout/notification_builder_test.xml
+++ b/tests/StatusBar/res/layout/notification_builder_test.xml
@@ -238,7 +238,7 @@
/>
<RadioButton
android:id="@+id/when_midnight"
- style="@style/FieldContents.Disabled"
+ style="@style/FieldContents"
android:text="midnight"
/>
<RadioButton
@@ -604,6 +604,11 @@
style="@style/FieldContents"
android:text="pineapple"
/>
+ <RadioButton
+ android:id="@+id/large_icon_pineapple2"
+ style="@style/FieldContents"
+ android:text="pineapple2"
+ />
</RadioGroup>
diff --git a/tests/StatusBar/src/com/android/statusbartest/NotificationBuilderTest.java b/tests/StatusBar/src/com/android/statusbartest/NotificationBuilderTest.java
index e9a3513..5a2ebac 100644
--- a/tests/StatusBar/src/com/android/statusbartest/NotificationBuilderTest.java
+++ b/tests/StatusBar/src/com/android/statusbartest/NotificationBuilderTest.java
@@ -16,6 +16,8 @@
package com.android.statusbartest;
+import java.util.GregorianCalendar;
+
import android.app.Activity;
import android.app.Notification;
import android.app.NotificationManager;
@@ -190,8 +192,14 @@ public class NotificationBuilderTest extends Activity
// when
switch (getRadioChecked(R.id.group_when)) {
- case R.id.when_midnight:
+ case R.id.when_midnight: {
+ GregorianCalendar c = new GregorianCalendar();
+ c.set(GregorianCalendar.HOUR_OF_DAY, 0);
+ c.set(GregorianCalendar.MINUTE, 0);
+ c.set(GregorianCalendar.SECOND, 0);
+ b.setWhen(c.getTimeInMillis());
break;
+ }
case R.id.when_now:
b.setWhen(System.currentTimeMillis());
break;
@@ -276,6 +284,9 @@ public class NotificationBuilderTest extends Activity
case R.id.large_icon_pineapple:
b.setLargeIcon(loadBitmap(R.drawable.pineapple));
break;
+ case R.id.large_icon_pineapple2:
+ b.setLargeIcon(loadBitmap(R.drawable.pineapple2));
+ break;
}
// sound TODO