Merge "Fixed a bug where the clearable flag was set inconsistently" into lmp-mr1-dev (9852ecd6) · Commits · e / os / android_frameworks_base

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

+0 −2

Original line number	Diff line number	Diff line
		@@ -1486,8 +1486,6 @@ public abstract class BaseStatusBar extends SystemUI implements
		entry.autoRedacted = true;
		}

		row.setClearable(sbn.isClearable());

		if (MULTIUSER_DEBUG) {
		TextView debug = (TextView) row.findViewById(R.id.debug_info);
		if (debug != null) {

+2 −11

Original line number	Diff line number	Diff line
		@@ -118,6 +118,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {

		public void setStatusBarNotification(StatusBarNotification statusBarNotification) {
		mStatusBarNotification = statusBarNotification;
		updateVetoButton();
		}

		public StatusBarNotification getStatusBarNotification() {
		@@ -303,17 +304,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
		* @return Can the underlying notification be cleared?
		*/
		public boolean isClearable() {
		return mClearable;
		}

		/**
		* Set whether the notification can be cleared.
		*
		* @param clearable
		*/
		public void setClearable(boolean clearable) {
		mClearable = clearable;
		updateVetoButton();
		return mStatusBarNotification != null && mStatusBarNotification.isClearable();
		}

		/**