diff options
| author | 2023-03-30 16:33:24 +0000 | |
|---|---|---|
| committer | 2023-03-30 16:33:24 +0000 | |
| commit | 4a15f0d084e9c336701593c438eb2cd9578bc3b4 (patch) | |
| tree | 3ebe448eedff95c30cbe2f49a20796c0c6012aab | |
| parent | 1df1042d32f0090b3a41e9678fae5c96d2405b0d (diff) | |
| parent | 1a033981f7741ee929cfcffab44a628b814cea00 (diff) | |
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>
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java index 557e95c64443..9f4929aceedf 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java +++ b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java @@ -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); |