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

Commit 24cf2b25 authored by Tony Huang's avatar Tony Huang Committed by Automerger Merge Worker
Browse files

Merge "Fix screnshot null during rotation" into tm-qpr-dev am: 4055b792 am:... 

Merge "Fix screnshot null during rotation" into tm-qpr-dev am: 4055b792 am: b71453f4 am: c86069f7

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



Change-Id: Ic0579bc13d5bfbbd757482199a5abc54d9ef97ee
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8e90c71a c86069f7

libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitDecorManager.java

+12 −4
Original line number Diff line number Diff line
@@ -248,11 +248,11 @@ public class SplitDecorManager extends WindowlessWindowManager { 


    /** Stops showing resizing hint. */

    public void onResized(SurfaceControl.Transaction t, Runnable animFinishedCallback) {

        if (mScreenshot != null) {

        if (mScreenshotAnimator != null && mScreenshotAnimator.isRunning()) {

            mScreenshotAnimator.cancel();

        }



        if (mScreenshot != null) {

            t.setPosition(mScreenshot, mOffsetX, mOffsetY);



            final SurfaceControl.Transaction animT = new SurfaceControl.Transaction();
@@ -322,6 +322,10 @@ public class SplitDecorManager extends WindowlessWindowManager { 
    /** Screenshot host leash and attach on it if meet some conditions */

    public void screenshotIfNeeded(SurfaceControl.Transaction t) {

        if (!mShown && mIsResizing && !mOldBounds.equals(mResizingBounds)) {

            if (mScreenshotAnimator != null && mScreenshotAnimator.isRunning()) {

                mScreenshotAnimator.cancel();

            }



            mTempRect.set(mOldBounds);

            mTempRect.offsetTo(0, 0);

            mScreenshot = ScreenshotUtils.takeScreenshot(t, mHostLeash, mTempRect,
@@ -334,6 +338,10 @@ public class SplitDecorManager extends WindowlessWindowManager { 
        if (screenshot == null || !screenshot.isValid()) return;



        if (!mShown && mIsResizing && !mOldBounds.equals(mResizingBounds)) {

            if (mScreenshotAnimator != null && mScreenshotAnimator.isRunning()) {

                mScreenshotAnimator.cancel();

            }



            mScreenshot = screenshot;

            t.reparent(screenshot, mHostLeash);

            t.setLayer(screenshot, Integer.MAX_VALUE - 1);