diff options
| author | Daniel Sandler <dsandler@android.com> | 2011-12-07 17:43:39 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-07 17:43:39 -0800 |
| commit | 1ba22cc33d0a87154e8ab94b8d4883e4c7083f8c (patch) | |
| tree | 20553fae8a4c2e98fad6ddaf666648372e66bfa9 /tests | |
| parent | 84a0060ea1379eec2f6f2a9e48fa7e1ada3a4fa9 (diff) | |
| parent | b490d8d6214114391622b4302ca2f5f39b2166c6 (diff) | |
| download | frameworks_base-1ba22cc33d0a87154e8ab94b8d4883e4c7083f8c.zip frameworks_base-1ba22cc33d0a87154e8ab94b8d4883e4c7083f8c.tar.gz frameworks_base-1ba22cc33d0a87154e8ab94b8d4883e4c7083f8c.tar.bz2 | |
am b490d8d6: am 29933fb2: Merge "Improve handling of small largeIcons in tablet ticker." into ics-mr1
* commit 'b490d8d6214114391622b4302ca2f5f39b2166c6':
Improve handling of small largeIcons in tablet ticker.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/StatusBar/res/layout/notification_builder_test.xml | 5 | ||||
| -rw-r--r-- | tests/StatusBar/src/com/android/statusbartest/NotificationBuilderTest.java | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/tests/StatusBar/res/layout/notification_builder_test.xml b/tests/StatusBar/res/layout/notification_builder_test.xml index e1199c7..6c384f7 100644 --- a/tests/StatusBar/res/layout/notification_builder_test.xml +++ b/tests/StatusBar/res/layout/notification_builder_test.xml @@ -605,6 +605,11 @@ style="@style/FieldContents" android:text="pineapple2" /> + <RadioButton + android:id="@+id/large_icon_small" + style="@style/FieldContents" + android:text="small" + /> </RadioGroup> diff --git a/tests/StatusBar/src/com/android/statusbartest/NotificationBuilderTest.java b/tests/StatusBar/src/com/android/statusbartest/NotificationBuilderTest.java index 5a2ebac..fefd890 100644 --- a/tests/StatusBar/src/com/android/statusbartest/NotificationBuilderTest.java +++ b/tests/StatusBar/src/com/android/statusbartest/NotificationBuilderTest.java @@ -287,6 +287,9 @@ public class NotificationBuilderTest extends Activity case R.id.large_icon_pineapple2: b.setLargeIcon(loadBitmap(R.drawable.pineapple2)); break; + case R.id.large_icon_small: + b.setLargeIcon(loadBitmap(R.drawable.icon2)); + break; } // sound TODO |