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

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

Merge "Remove redundant setContentView to fix screenshot focus" into... 

Merge "Remove redundant setContentView to fix screenshot focus" into tm-qpr-dev am: 1a033981 am: 4a15f0d0 am: 0904eb4a am: 93c6f762

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



Change-Id: I8cf49e64401545eed321847dfcc2f769de8c9dfa
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e3b3fefa 93c6f762

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

+0 −8
Original line number Diff line number Diff line
@@ -488,10 +488,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);
@@ -790,10 +786,6 @@ public class ScreenshotController { 
        mScreenshotView.badgeScreenshot(mContext.getPackageManager().getUserBadgedIcon(

                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);