Merge "Fix bug where Folder gets stuck with an invalid OutlineProvider when... (069946b1) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/anim/RevealOutlineAnimation.java

+4 −12

Original line number	Diff line number	Diff line
		@@ -34,7 +34,6 @@ public abstract class RevealOutlineAnimation extends ViewOutlineProvider {
		final float elevation = revealView.getElevation();

		va.addListener(new AnimatorListenerAdapter() {
		private boolean mWasCanceled = false;
		private boolean mIsClippedToOutline;
		private ViewOutlineProvider mOldOutlineProvider;

		@@ -49,20 +48,13 @@ public abstract class RevealOutlineAnimation extends ViewOutlineProvider {
		}
		}

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

		public void onAnimationEnd(Animator animation) {
		if (!mWasCanceled) {
		revealView.setOutlineProvider(mOldOutlineProvider);
		revealView.setClipToOutline(mIsClippedToOutline);
		if (shouldRemoveElevationDuringAnimation()) {
		revealView.setTranslationZ(0);
		}
		}
		}

		});