Removing notifications always immediately when swiping them away (fabd50de) · Commits · e / os / android_frameworks_base

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

+4 −11

Original line number	Diff line number	Diff line
		@@ -983,12 +983,12 @@ public abstract class BaseStatusBar extends SystemUI implements
		// Accessibility feedback
		v.announceForAccessibility(
		mContext.getString(R.string.accessibility_notification_dismissed));
		performRemoveNotification(row.getStatusBarNotification(), false /* removeView */);
		performRemoveNotification(row.getStatusBarNotification());
		}
		});
		}

		protected void performRemoveNotification(StatusBarNotification n, boolean removeView) {
		protected void performRemoveNotification(StatusBarNotification n) {
		final String pkg = n.getPackageName();
		final String tag = n.getTag();
		final int id = n.getId();
		@@ -998,14 +998,8 @@ public abstract class BaseStatusBar extends SystemUI implements
		if (FORCE_REMOTE_INPUT_HISTORY
		&& mKeysKeptForRemoteInput.contains(n.getKey())) {
		mKeysKeptForRemoteInput.remove(n.getKey());
		removeView = true;
		}
		if (mRemoteInputEntriesToRemoveOnCollapse.remove(mNotificationData.get(n.getKey()))) {
		removeView = true;
		}
		if (removeView) {
		removeNotification(n.getKey(), null);
		}

		} catch (RemoteException ex) {
		// system process is dead if we're here.
		@@ -2004,8 +1998,7 @@ public abstract class BaseStatusBar extends SystemUI implements
		Runnable removeRunnable = new Runnable() {
		@Override
		public void run() {
		performRemoveNotification(parentToCancelFinal,
		true);
		performRemoveNotification(parentToCancelFinal);
		}
		};
		if (isCollapsing()) {

+2 −2

Original line number	Diff line number	Diff line
		@@ -1699,12 +1699,12 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
		}

		@Override
		protected void performRemoveNotification(StatusBarNotification n, boolean removeView) {
		protected void performRemoveNotification(StatusBarNotification n) {
		Entry entry = mNotificationData.get(n.getKey());
		if (mRemoteInputController.isRemoteInputActive(entry)) {
		mRemoteInputController.removeRemoteInput(entry, null);
		}
		super.performRemoveNotification(n, removeView);
		super.performRemoveNotification(n);
		}

		@Override