Merge "Reset the screenshot preview intent on clear" into rvc-qpr-dev am: 1b0cd663cf

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12191479

Change-Id: Ibbc03c74352a1a4d585eef8fbf2a10b36e2f9f2a
This commit is contained in:
Miranda Kephart
2020-07-22 18:51:30 +00:00
committed by Automerger Merge Worker

View File

@@ -1013,6 +1013,7 @@ public class GlobalScreenshot implements ViewTreeObserver.OnComputeInternalInset
mScreenshotPreview.setLayerType(View.LAYER_TYPE_NONE, null); mScreenshotPreview.setLayerType(View.LAYER_TYPE_NONE, null);
mScreenshotPreview.setContentDescription( mScreenshotPreview.setContentDescription(
mContext.getResources().getString(R.string.screenshot_preview_description)); mContext.getResources().getString(R.string.screenshot_preview_description));
mScreenshotPreview.setOnClickListener(null);
mScreenshotLayout.setAlpha(1); mScreenshotLayout.setAlpha(1);
mDismissButton.setTranslationY(0); mDismissButton.setTranslationY(0);
mActionsContainer.setTranslationY(0); mActionsContainer.setTranslationY(0);