Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove redundant setContentView to fix screenshot focus" into tm-qpr-dev

Browse Source
This commit is contained in:
Miranda Kephart
2023-03-29 19:37:33 +00:00
committed by Android (Google) Code Review
parent e572351d26 60016c9dd7
commit 1a033981f7
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java
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 // ignore system bar insets for the purpose of window layout
mWindow.getDecorView().setOnApplyWindowInsetsListener( mWindow.getDecorView().setOnApplyWindowInsetsListener(
(v, insets) -> WindowInsets.CONSUMED); (v, insets) -> WindowInsets.CONSUMED);
@@ -799,10 +795,6 @@ public class ScreenshotController {
mContext.getDrawable(R.drawable.overlay_badge_background), owner)); mContext.getDrawable(R.drawable.overlay_badge_background), owner));
} }
mScreenshotView.setScreenshot(mScreenBitmap, screenInsets); mScreenshotView.setScreenshot(mScreenBitmap, screenInsets);
if (DEBUG_WINDOW) {
Log.d(TAG, "setContentView: " + mScreenshotView);
}
setContentView(mScreenshotView);
// ignore system bar insets for the purpose of window layout // ignore system bar insets for the purpose of window layout
mWindow.getDecorView().setOnApplyWindowInsetsListener( mWindow.getDecorView().setOnApplyWindowInsetsListener(
(v, insets) -> WindowInsets.CONSUMED); (v, insets) -> WindowInsets.CONSUMED);