Merge "Make NPVC match on qpr and main" (88e101a8) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java

+35 −30

Original line number	Diff line number	Diff line
		@@ -4747,8 +4747,10 @@ public final class NotificationPanelViewController {
		/**
		* Maybe vibrate as panel is opened.
		*
		* @param openingWithTouch Whether the panel is being opened with touch. If the panel is instead
		* being opened programmatically (such as by the open panel gesture), we always play haptic.
		* @param openingWithTouch Whether the panel is being opened with touch. If the panel is
		* instead
		* being opened programmatically (such as by the open panel gesture), we
		* always play haptic.
		*/
		private void maybeVibrateOnOpening(boolean openingWithTouch) {
		if (mVibrateOnOpening) {
		@@ -4914,10 +4916,12 @@ public final class NotificationPanelViewController {
		animator.setInterpolator(Interpolators.FAST_OUT_SLOW_IN);
		animator.addListener(new AnimatorListenerAdapter() {
		private boolean mCancelled;

		@Override
		public void onAnimationCancel(Animator animation) {
		mCancelled = true;
		}

		@Override
		public void onAnimationEnd(Animator animation) {
		mIsSpringBackAnimation = false;
		@@ -6323,3 +6327,4 @@ public final class NotificationPanelViewController {
		}
		}
		}