diff options
| author | Joe Onorato <joeo@google.com> | 2010-10-31 11:38:04 -0700 |
|---|---|---|
| committer | Joe Onorato <joeo@google.com> | 2010-10-31 11:38:04 -0700 |
| commit | 4058ba052682129f2d1055116aaffb2e91c2013d (patch) | |
| tree | 035a170b99400499543ad81f977bdffb72fd53bd /tests/StatusBar/res | |
| parent | 2b69ce469d544f4b2cb6423feaf4da8df7cf7a64 (diff) | |
| download | frameworks_base-4058ba052682129f2d1055116aaffb2e91c2013d.zip frameworks_base-4058ba052682129f2d1055116aaffb2e91c2013d.tar.gz frameworks_base-4058ba052682129f2d1055116aaffb2e91c2013d.tar.bz2 | |
Allow both contentIntent and setOnClickPendingIntent in notifications
From the app developer's request:
Intents assigned to specific views should take precedence over the content intent, but it should not
be required to set the content intent to null in order for the view-intents to work
Bug: 3107945
Change-Id: Ic5282d441277a9a8c8c700ef3f43872f3405b58a
Diffstat (limited to 'tests/StatusBar/res')
| -rw-r--r-- | tests/StatusBar/res/layout/button_notification.xml | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/tests/StatusBar/res/layout/button_notification.xml b/tests/StatusBar/res/layout/button_notification.xml new file mode 100644 index 0000000..822e8cd --- /dev/null +++ b/tests/StatusBar/res/layout/button_notification.xml @@ -0,0 +1,21 @@ +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="80sp" + android:orientation="horizontal" + > + + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:src="@drawable/icon1" + /> + + <Button android:id="@+id/button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="button" + /> + +</LinearLayout> + |