Merge "Merge "Allow resetTranslation on notification menu open" into rvc-dev... (87d8b65b) · Commits · e / os / android_frameworks_base

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

+3 −5

Original line number	Diff line number	Diff line
		@@ -1680,7 +1680,9 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
		public void reset() {
		mShowingPublicInitialized = false;
		unDismiss();
		if (mMenuRow == null \|\| !mMenuRow.isMenuVisible()) {
		resetTranslation();
		}
		onHeightReset();
		requestLayout();
		}
		@@ -1838,10 +1840,6 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
		}

		public void resetTranslation() {
		if (mMenuRow != null && mMenuRow.isMenuVisible()) {
		return;
		}

		if (mTranslateAnim != null) {
		mTranslateAnim.cancel();
		}