Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a15f0d0 authored by Miranda Kephart's avatar Miranda Kephart Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I6b41fea4afe72dd9715073034b877425dc2a2ed9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1df1042d 1a033981

packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java

+0 −8
Original line number Diff line number Diff line
@@ -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);