Merge "Remove redundant setContentView to fix screenshot focus" into tm-qpr-dev am: 1a033981f7

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

Change-Id: I6b41fea4afe72dd9715073034b877425dc2a2ed9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Miranda Kephart
2023-03-30 16:33:24 +00:00
committed by Automerger Merge Worker

View File

@@ -491,10 +491,6 @@ public class ScreenshotController {
});
}
if (DEBUG_WINDOW) {
Log.d(TAG, "setContentView: " + mScreenshotView);
}
setContentView(mScreenshotView);
// ignore system bar insets for the purpose of window layout
mWindow.getDecorView().setOnApplyWindowInsetsListener(
(v, insets) -> WindowInsets.CONSUMED);
@@ -799,10 +795,6 @@ public class ScreenshotController {
mContext.getDrawable(R.drawable.overlay_badge_background), owner));
}
mScreenshotView.setScreenshot(mScreenBitmap, screenInsets);
if (DEBUG_WINDOW) {
Log.d(TAG, "setContentView: " + mScreenshotView);
}
setContentView(mScreenshotView);
// ignore system bar insets for the purpose of window layout
mWindow.getDecorView().setOnApplyWindowInsetsListener(
(v, insets) -> WindowInsets.CONSUMED);