Merge "Dismiss all snoozed notifications upon swiping another" into qt-dev (8b865cd7) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java

+5 −4

Original line number	Diff line number	Diff line
		@@ -477,8 +477,6 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd
		private float mHorizontalPanelTranslation;
		private final NotificationLockscreenUserManager mLockscreenUserManager =
		Dependency.get(NotificationLockscreenUserManager.class);
		protected final NotificationGutsManager mGutsManager =
		Dependency.get(NotificationGutsManager.class);
		private final Rect mTmpRect = new Rect();
		private final NotificationEntryManager mEntryManager =
		Dependency.get(NotificationEntryManager.class);
		@@ -625,7 +623,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd
		inflateFooterView();
		mVisualStabilityManager.setVisibilityLocationProvider(this::isInVisibleLocation);
		if (mAllowLongPress) {
		setLongPressListener(mGutsManager::openGuts);
		setLongPressListener(mNotificationGutsManager::openGuts);
		}
		}

		@@ -6145,6 +6143,9 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd
		.setType(MetricsEvent.TYPE_ACTION));
		mHeadsUpManager.setMenuShown(notificationRow.getEntry(), true);
		mSwipeHelper.onMenuShown(row);
		mNotificationGutsManager.closeAndSaveGuts(true /* removeLeavebehind */,
		false /* force /, false / removeControls /, -1 / x /, -1 / y */,
		false /* resetMenu */);

		// Check to see if we want to go directly to the notfication guts
		NotificationMenuRowPlugin provider = notificationRow.getProvider();
		@@ -6152,7 +6153,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd
		MenuItem item = provider.menuItemToExposeOnSnap();
		if (item != null) {
		Point origin = provider.getRevealAnimationOrigin();
		mGutsManager.openGuts(row, origin.x, origin.y, item);
		mNotificationGutsManager.openGuts(row, origin.x, origin.y, item);
		} else {
		Log.e(TAG, "Provider has shouldShowGutsOnSnapOpen, but provided no "
		+ "menu item in menuItemtoExposeOnSnap. Skipping.");