Merge "Fix screenshot not showing up on subsequent screenshots" into tm-dev (9801ab99) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotView.java

+10 −1

Original line number	Diff line number	Diff line
		@@ -403,12 +403,20 @@ public class ScreenshotView extends FrameLayout implements
		}

		@Override
		public void onSwipeDismissInitiated(Animator animator) {
		public void onSwipeDismissInitiated(Animator anim) {
		if (DEBUG_DISMISS) {
		Log.d(ScreenshotView.TAG, "dismiss triggered via swipe gesture");
		}
		mUiEventLogger.log(ScreenshotEvent.SCREENSHOT_SWIPE_DISMISSED, 0,
		mPackageName);
		anim.addListener(new AnimatorListenerAdapter() {
		@Override
		public void onAnimationStart(Animator animation) {
		super.onAnimationStart(animation);
		mBackgroundProtection.animate()
		.alpha(0).setDuration(anim.getDuration()).start();
		}
		});
		}

		@Override
		@@ -999,6 +1007,7 @@ public class ScreenshotView extends FrameLayout implements
		mSmartChips.clear();
		mQuickShareChip = null;
		setAlpha(1);
		mScreenshotStatic.setAlpha(1);
		mScreenshotSelectorView.stop();
		}