Merge "Revert "Make Notification long clickable"" into tm-qpr-dev (324457d5) · Commits · e / os / android_frameworks_base

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

+0 −25

Original line number	Diff line number	Diff line
		@@ -591,7 +591,6 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
		}
		mShowingPublicInitialized = false;
		updateNotificationColor();
		updateLongClickable();
		if (mMenuRow != null) {
		mMenuRow.onNotificationUpdated(mEntry.getSbn());
		mMenuRow.setAppName(mAppName);
		@@ -1197,26 +1196,8 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
		return getShowingLayout().getVisibleWrapper();
		}

		private boolean isNotificationRowLongClickable() {
		if (mLongPressListener == null) {
		return false;
		}

		if (!areGutsExposed()) { // guts is not opened
		return true;
		}

		// if it is leave behind, it shouldn't be long clickable.
		return !isGutsLeaveBehind();
		}

		private void updateLongClickable() {
		setLongClickable(isNotificationRowLongClickable());
		}

		public void setLongPressListener(LongPressListener longPressListener) {
		mLongPressListener = longPressListener;
		updateLongClickable();
		}

		public void setDragController(ExpandableNotificationRowDragController dragController) {
		@@ -2063,13 +2044,11 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
		void onGutsOpened() {
		resetTranslation();
		updateContentAccessibilityImportanceForGuts(false /* isEnabled */);
		updateLongClickable();
		}

		void onGutsClosed() {
		updateContentAccessibilityImportanceForGuts(true /* isEnabled */);
		mIsSnoozed = false;
		updateLongClickable();
		}

		/**
		@@ -2968,10 +2947,6 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
		return (mGuts != null && mGuts.isExposed());
		}

		private boolean isGutsLeaveBehind() {
		return (mGuts != null && mGuts.isLeavebehind());
		}

		@Override
		public boolean isContentExpandable() {
		if (mIsSummaryWithChildren && !shouldShowPublic()) {

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

+1 −3

Original line number	Diff line number	Diff line
		@@ -586,9 +586,7 @@ public class NotificationGutsManager implements NotifGutsViewManager {
		}

		final ExpandableNotificationRow row = (ExpandableNotificationRow) view;
		if (view.isLongClickable()) {
		view.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
		}
		if (row.areGutsExposed()) {
		closeAndSaveGuts(false /* removeLeavebehind /, false / force */,
		true /* removeControls /, -1 / x /, -1 / y */,