Revert "Merge "Allow notifications to not specify a contentIntent."" (39b4867d) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/LatestItemView.java

+1 −11

Original line number	Diff line number	Diff line
		@@ -23,22 +23,12 @@ 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);
		}
		}

+0 −4

Original line number	Diff line number	Diff line
		@@ -440,8 +440,6 @@ public class PhoneStatusBarService extends StatusBarService {
		if (contentIntent != null) {
		oldEntry.content.setOnClickListener(new Launcher(contentIntent,
		notification.pkg, notification.tag, notification.id));
		} else {
		oldEntry.content.setOnClickListener(null);
		}
		// Update the icon.
		final StatusBarIcon ic = new StatusBarIcon(notification.pkg,
		@@ -518,8 +516,6 @@ public class PhoneStatusBarService extends StatusBarService {
		if (contentIntent != null) {
		content.setOnClickListener(new Launcher(contentIntent, notification.pkg,
		notification.tag, notification.id));
		} else {
		oldEntry.content.setOnClickListener(null);
		}

		View expanded = null;

+0 −4

Original line number	Diff line number	Diff line
		@@ -370,8 +370,6 @@ public class TabletStatusBarService extends StatusBarService {
		if (contentIntent != null) {
		oldEntry.content.setOnClickListener(new NotificationClicker(contentIntent,
		notification.pkg, notification.tag, notification.id));
		} else {
		oldEntry.content.setOnClickListener(null);
		}
		// Update the icon.
		final StatusBarIcon ic = new StatusBarIcon(notification.pkg,
		@@ -762,8 +760,6 @@ public class TabletStatusBarService extends StatusBarService {
		if (contentIntent != null) {
		content.setOnClickListener(new NotificationClicker(contentIntent,
		sbn.pkg, sbn.tag, sbn.id));
		} else {
		content.setOnClickListener(null);
		}

		View expanded = null;

+4 −0

Original line number	Diff line number	Diff line
		@@ -741,6 +741,10 @@ public class NotificationManagerService extends INotificationManager.Stub
		throw new IllegalArgumentException("contentView required: pkg=" + pkg
		+ " id=" + id + " notification=" + notification);
		}
		if (notification.contentIntent == null) {
		throw new IllegalArgumentException("contentIntent required: pkg=" + pkg
		+ " id=" + id + " notification=" + notification);
		}
		}

		synchronized (mNotificationList) {

+0 −18

Original line number	Diff line number	Diff line
		@@ -86,18 +86,6 @@ public class NotificationTestList extends TestActivity
		}
		},

		new Test("custom intent on text view") {
		public void run() {
		Notification n = new Notification(R.drawable.icon1, null,
		mActivityCreateTime);
		n.setLatestEventInfo(NotificationTestList.this, "Persistent #1",
		"This is a notification!!!", null);
		n.contentView.setOnClickPendingIntent(com.android.internal.R.id.text,
		makeIntent2());
		mNM.notify(1, n);
		}
		},

		new Test("Ticker 1 line") {
		public void run() {
		Notification n = new Notification(R.drawable.icon1, "tick tick tick",
		@@ -788,12 +776,6 @@ public class NotificationTestList extends TestActivity
		return PendingIntent.getActivity(this, 0, intent, 0);
		}

		private PendingIntent makeIntent2() {
		Intent intent = new Intent(this, StatusBarTest.class);
		return PendingIntent.getActivity(this, 0, intent, 0);
		}


		class StateStress extends Test {
		StateStress(String name, int pause, int iterations, Runnable[] tasks) {
		super(name);