Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Allow both contentIntent and setOnClickPendingIntent in notifications"

Browse Source
This commit is contained in:
Joe Onorato
2010-10-31 11:41:47 -07:00
committed by Android (Google) Code Review
parent 9c3a80b236 4058ba0526
commit 6b21cdeb5f
3 changed files with 34 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/SystemUI/src/com/android/systemui/statusbar/LatestItemView.java
View File

@@ -23,22 +23,11 @@ import android.view.MotionEvent;
import android.widget.FrameLayout;
public class LatestItemView extends FrameLayout {
private boolean mDispatchTorches;
public LatestItemView(Context context, AttributeSet attrs) {
super(context, attrs);
}
public boolean dispatchTouchEvent(MotionEvent ev) {
if (mDispatchTorches) {
return super.dispatchTouchEvent(ev);
} else {
return onTouchEvent(ev);
}
}
public void setOnClickListener(OnClickListener l) {
mDispatchTorches = l == null;
super.setOnClickListener(l);
}
}

21
tests/StatusBar/res/layout/button_notification.xml Normal file
View File

@@ -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>

13
tests/StatusBar/src/com/android/statusbartest/NotificationTestList.java
View File

@@ -100,6 +100,19 @@ public class NotificationTestList extends TestActivity
}
},
new Test("Button") {
public void run() {
Notification n = new Notification(R.drawable.icon1, null,
mActivityCreateTime);
n.contentView = new RemoteViews(getPackageName(), R.layout.button_notification);
n.flags |= Notification.FLAG_ONGOING_EVENT;
n.contentIntent = makeIntent();
n.contentView.setOnClickPendingIntent(R.id.button, makeIntent2());
mNM.notify(1, n);
}
},
new Test("custom intent on text view") {
public void run() {
Notification n = new Notification(R.drawable.icon1, null,