Merge "[automerger skipped] Merge "Generate ACTION_CANCEL event when screen... (c22be8e2) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/AppOpsInfo.java

+0 −5

Original line number	Diff line number	Diff line
		@@ -188,11 +188,6 @@ public class AppOpsInfo extends LinearLayout implements NotificationGuts.GutsCon
		return false;
		}

		@Override
		public boolean needsFalsingProtection() {
		return false;
		}

		@Override
		public View getContentView() {
		return this;

+0 −5

Original line number	Diff line number	Diff line
		@@ -403,11 +403,6 @@ public class NotificationConversationInfo extends LinearLayout implements
		// TODO: do we need to do anything here?
		}

		@Override
		public boolean needsFalsingProtection() {
		return true;
		}

		@Override
		public void onInitializeAccessibilityEvent(AccessibilityEvent event) {
		super.onInitializeAccessibilityEvent(event);

+0 −6

Original line number	Diff line number	Diff line
		@@ -104,12 +104,6 @@ public class NotificationGuts extends FrameLayout {
		* Called when the guts view has finished its close animation.
		*/
		default void onFinishedClosing() {}

		/**
		* Returns whether falsing protection is needed before showing the contents of this
		* view on the lockscreen
		*/
		boolean needsFalsingProtection();
		}

		public interface OnGutsClosedListener {

+14 −18

Original line number	Diff line number	Diff line
		@@ -523,10 +523,7 @@ public class NotificationGutsManager implements Dumpable, NotificationLifetimeEx
		int x,
		int y,
		NotificationMenuRowPlugin.MenuItem menuItem) {
		if (menuItem.getGutsView() instanceof NotificationGuts.GutsContent) {
		NotificationGuts.GutsContent gutsView =
		(NotificationGuts.GutsContent) menuItem.getGutsView();
		if (gutsView.needsFalsingProtection()) {
		if (menuItem.getGutsView() instanceof NotificationInfo) {
		if (mStatusBarStateController instanceof StatusBarStateControllerImpl) {
		((StatusBarStateControllerImpl) mStatusBarStateController)
		.setLeaveOpenOnKeyguardHide(true);
		@@ -544,7 +541,6 @@ public class NotificationGutsManager implements Dumpable, NotificationLifetimeEx

		return true;
		}
		}
		return openGutsInternal(view, x, y, menuItem);
		}

+0 −5

Original line number	Diff line number	Diff line
		@@ -489,11 +489,6 @@ public class NotificationInfo extends LinearLayout implements NotificationGuts.G
		mMetricsLogger.write(notificationControlsLogMaker().setType(MetricsEvent.TYPE_CLOSE));
		}

		@Override
		public boolean needsFalsingProtection() {
		return true;
		}

		@Override
		public void onInitializeAccessibilityEvent(AccessibilityEvent event) {
		super.onInitializeAccessibilityEvent(event);