Remove dismiss-rtl setters because dismiss is bidirectional am: 53f489d7b0 (6a2193ed) · Commits · e / os / android_frameworks_base

packages/SystemUI/plugin/src/com/android/systemui/plugins/statusbar/NotificationMenuRowPlugin.java

+0 −6

Original line number	Diff line number	Diff line
		@@ -182,12 +182,6 @@ public interface NotificationMenuRowPlugin extends Plugin {
		*/
		public boolean canBeDismissed();

		/**
		* Informs the menu whether dismiss gestures are left-to-right or right-to-left.
		*/
		default void setDismissRtl(boolean dismissRtl) {
		}

		/**
		* Determines whether the menu should remain open given its current state, or snap closed.
		* @return true if the menu should remain open, false otherwise.

+0 −7

Original line number	Diff line number	Diff line
		@@ -3201,13 +3201,6 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
		}
		}

		/** Sets whether dismiss gestures are right-to-left (instead of left-to-right). */
		public void setDismissRtl(boolean dismissRtl) {
		if (mMenuRow != null) {
		mMenuRow.setDismissRtl(dismissRtl);
		}
		}

		private static class NotificationViewState extends ExpandableViewState {

		@Override

+0 −9

Original line number	Diff line number	Diff line
		@@ -85,7 +85,6 @@ public class NotificationMenuRow implements NotificationMenuRowPlugin, View.OnCl
		private ArrayList<MenuItem> mRightMenuItems;
		private final Map<View, MenuItem> mMenuItemsByView = new ArrayMap<>();
		private OnMenuEventListener mMenuListener;
		private boolean mDismissRtl;

		private ValueAnimator mFadeAnimator;
		private boolean mAnimating;
		@@ -790,14 +789,6 @@ public class NotificationMenuRow implements NotificationMenuRowPlugin, View.OnCl
		return getParent().canViewBeDismissed();
		}

		@Override
		public void setDismissRtl(boolean dismissRtl) {
		mDismissRtl = dismissRtl;
		if (mMenuContainer != null) {
		createMenuViews(true);
		}
		}

		public static class NotificationMenuItem implements MenuItem {
		View mMenuView;
		GutsContent mGutsContent;

+0 −12

Original line number	Diff line number	Diff line
		@@ -161,7 +161,6 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
		private final Paint mBackgroundPaint = new Paint();
		private final boolean mShouldDrawNotificationBackground;
		private boolean mHighPriorityBeforeSpeedBump;
		private boolean mDismissRtl;

		private float mExpandedHeight;
		private int mOwnScrollY;
		@@ -613,16 +612,6 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
		addView(mFgsSectionView, -1);
		}

		void updateDismissRtlSetting(boolean dismissRtl) {
		mDismissRtl = dismissRtl;
		for (int i = 0; i < getChildCount(); i++) {
		View child = getChildAt(i);
		if (child instanceof ExpandableNotificationRow) {
		((ExpandableNotificationRow) child).setDismissRtl(dismissRtl);
		}
		}
		}

		/**
		* Set the overexpansion of the panel to be applied to the view.
		*/
		@@ -2915,7 +2904,6 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
		updateChronometerForChild(child);
		if (child instanceof ExpandableNotificationRow) {
		ExpandableNotificationRow row = (ExpandableNotificationRow) child;
		row.setDismissRtl(mDismissRtl);
		row.setDismissUsingRowTranslationX(mDismissUsingRowTranslationX);

		}

+0 −4

Original line number	Diff line number	Diff line
		@@ -783,9 +783,6 @@ public class NotificationStackScrollLayoutController {
		mTunerService.addTunable(
		(key, newValue) -> {
		switch (key) {
		case Settings.Secure.NOTIFICATION_DISMISS_RTL:
		mView.updateDismissRtlSetting("1".equals(newValue));
		break;
		case Settings.Secure.NOTIFICATION_HISTORY_ENABLED:
		updateFooter();
		break;
		@@ -795,7 +792,6 @@ public class NotificationStackScrollLayoutController {
		}
		},
		HIGH_PRIORITY,
		Settings.Secure.NOTIFICATION_DISMISS_RTL,
		Settings.Secure.NOTIFICATION_HISTORY_ENABLED);

		mKeyguardMediaController.setVisibilityChangedListener(visible -> {