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

Merge "Fix screenshot back key recognition" into tm-qpr-dev

Browse Source
This commit is contained in:
Miranda Kephart
2023-01-18 16:49:27 +00:00
committed by Android (Google) Code Review
parent a2d811ed1e 0b8ada648e
commit 6dc9f563f8
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java
View File

@@ -553,6 +553,10 @@ public class ScreenshotController {
Log.d(TAG, "adding OnComputeInternalInsetsListener"); Log.d(TAG, "adding OnComputeInternalInsetsListener");
} }
mScreenshotView.getViewTreeObserver().addOnComputeInternalInsetsListener(mScreenshotView); mScreenshotView.getViewTreeObserver().addOnComputeInternalInsetsListener(mScreenshotView);
if (DEBUG_WINDOW) {
Log.d(TAG, "setContentView: " + mScreenshotView);
}
setContentView(mScreenshotView);
} }
/** /**
@@ -634,6 +638,7 @@ public class ScreenshotController {
// The window is focusable by default // The window is focusable by default
setWindowFocusable(true); setWindowFocusable(true);
mScreenshotView.requestFocus();
// Wait until this window is attached to request because it is // Wait until this window is attached to request because it is
// the reference used to locate the target window (below). // the reference used to locate the target window (below).
@@ -691,10 +696,7 @@ 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);