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

Merge "Fix screenshot behavior with display cutout" into sc-dev

Browse Source
This commit is contained in:
Miranda Kephart
2021-02-03 20:43:19 +00:00
committed by Android (Google) Code Review
parent 3a1c63cf05 f93d23ac58
commit a5e22cf5ef
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -388,12 +388,6 @@ public class ScreenshotController {
}
});
// ignore system bar insets for the purpose of window layout
mScreenshotView.setOnApplyWindowInsetsListener((v, insets) -> v.onApplyWindowInsets(
new WindowInsets.Builder(insets)
.setInsets(WindowInsets.Type.all(), Insets.NONE)
.build()));
// TODO(159460485): Remove this when focus is handled properly in the system
mScreenshotView.setOnTouchListener((v, event) -> {
if (event.getActionMasked() == MotionEvent.ACTION_OUTSIDE) {
@@ -533,9 +527,6 @@ public class ScreenshotController {
attachWindow();
if (DEBUG_WINDOW) {
Log.d(TAG, "setContentView: " + mScreenshotView);
}
mScreenshotView.getViewTreeObserver().addOnPreDrawListener(
new ViewTreeObserver.OnPreDrawListener() {
@Override
@@ -549,7 +540,13 @@ public class ScreenshotController {
}
});
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);
cancelTimeout(); // restarted after animation
}