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

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

Merge "Post screenshot removeWindow call if necessary" into 24D1-dev am: 2c4120b2 

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



Change-Id: Ib4d834b2ca6ff6c9361a16406204c28b18d08577
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cd840608 2c4120b2

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

+10 −4
Original line number Diff line number Diff line
@@ -223,7 +223,8 @@ public class ScreenshotController { 
    private Bitmap mScreenBitmap;

    private SaveImageInBackgroundTask mSaveInBgTask;

    private boolean mScreenshotTakenInPortrait;

    private boolean mBlockAttach;

    private boolean mAttachRequested;

    private boolean mDetachRequested;

    private Animator mScreenshotAnimation;

    private RequestCallback mCurrentRequestCallback;

    private ScreenshotActionsProvider mActionsProvider;
@@ -687,7 +688,7 @@ public class ScreenshotController { 
                    new ViewTreeObserver.OnWindowAttachListener() {

                        @Override

                        public void onWindowAttached() {

                            mBlockAttach = false;

                            mAttachRequested = false;

                            decorView.getViewTreeObserver().removeOnWindowAttachListener(this);

                            action.run();

                        }
@@ -703,13 +704,13 @@ public class ScreenshotController { 
    @MainThread

    private void attachWindow() {

        View decorView = mWindow.getDecorView();

        if (decorView.isAttachedToWindow() || mBlockAttach) {

        if (decorView.isAttachedToWindow() || mAttachRequested) {

            return;

        }

        if (DEBUG_WINDOW) {

            Log.d(TAG, "attachWindow");

        }

        mBlockAttach = true;

        mAttachRequested = true;

        mWindowManager.addView(decorView, mWindowLayoutParams);

        decorView.requestApplyInsets();
@@ -727,6 +728,11 @@ public class ScreenshotController { 
                Log.d(TAG, "Removing screenshot window");

            }

            mWindowManager.removeViewImmediate(decorView);

            mDetachRequested = false;

        }

        if (mAttachRequested && !mDetachRequested) {

            mDetachRequested = true;

            withWindowAttached(this::removeWindow);

        }



        mViewProxy.stopInputListening();