Merge "Fix bug swiping away NO_CLEAR notifications." (8dbdee5b) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

+4 −11

Original line number	Original line	Diff line number	Diff line
	@@ -759,13 +759,11 @@ public class PhoneStatusBar extends StatusBar {
	}		}
	}		}
	});		});
	} else {
	if ((notification.notification.flags & Notification.FLAG_ONGOING_EVENT) == 0) {
	vetoButton.setVisibility(View.INVISIBLE);
	} else {		} else {
	vetoButton.setVisibility(View.GONE);		vetoButton.setVisibility(View.GONE);
	}		}
	}		vetoButton.setContentDescription(mContext.getString(
			R.string.accessibility_remove_notification));

	// the large icon		// the large icon
	ImageView largeIcon = (ImageView)row.findViewById(R.id.large_icon);		ImageView largeIcon = (ImageView)row.findViewById(R.id.large_icon);
	@@ -956,14 +954,9 @@ public class PhoneStatusBar extends StatusBar {
	}		}
	}		}
	});		});
	} else {
	if ((sbn.notification.flags & Notification.FLAG_ONGOING_EVENT) == 0) {
	vetoButton.setVisibility(View.INVISIBLE);
	vetoButton.setContentDescription("VETO");
	} else {		} else {
	vetoButton.setVisibility(View.GONE);		vetoButton.setVisibility(View.GONE);
	}		}
	}
	vetoButton.setContentDescription(mContext.getString(		vetoButton.setContentDescription(mContext.getString(
	R.string.accessibility_remove_notification));		R.string.accessibility_remove_notification));

+1 −6

Original line number	Original line	Diff line number	Diff line
	@@ -1746,14 +1746,9 @@ public class TabletStatusBar extends StatusBar implements
	}		}
	}		}
	});		});
	} else {
	if ((sbn.notification.flags & Notification.FLAG_ONGOING_EVENT) == 0) {
	vetoButton.setVisibility(View.INVISIBLE);
	vetoButton.setContentDescription("VETO");
	} else {		} else {
	vetoButton.setVisibility(View.GONE);		vetoButton.setVisibility(View.GONE);
	}		}
	}
	vetoButton.setContentDescription(mContext.getString(		vetoButton.setContentDescription(mContext.getString(
	R.string.accessibility_remove_notification));		R.string.accessibility_remove_notification));