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

Commit 1a033981 authored by Miranda Kephart's avatar Miranda Kephart Committed by Android (Google) Code Review
Browse files

Merge "Remove redundant setContentView to fix screenshot focus" into tm-qpr-dev

parents e572351d 60016c9d

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