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

Commit b760ad1f authored by Evan Rosky's avatar Evan Rosky Committed by Automerger Merge Worker
Browse files

Merge "Apply split-screen resize on sync queue" into rvc-qpr-dev am: e7dbe60d 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I987f95a8bbb7c56dbac7ac25437cbea43c945cda
parents cca000ac e7dbe60d

packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java

+2 −2
Original line number Diff line number Diff line
@@ -618,7 +618,7 @@ public class DividerView extends FrameLayout implements OnTouchListener, 
            mEntranceAnimationRunning = false;

            mExitAnimationRunning = false;

            if (!dismissed && !wasMinimizeInteraction) {

                WindowManagerProxy.applyResizeSplits(snapTarget.position, mSplitLayout);

                mWindowManagerProxy.applyResizeSplits(snapTarget.position, mSplitLayout);

            }

            if (mCallback != null) {

                mCallback.onDraggingEnd();
@@ -889,7 +889,7 @@ public class DividerView extends FrameLayout implements OnTouchListener, 
        t.hide(sc).apply();

        mTiles.releaseTransaction(t);

        int midPos = mSplitLayout.getSnapAlgorithm().getMiddleTarget().position;

        WindowManagerProxy.applyResizeSplits(midPos, mSplitLayout);

        mWindowManagerProxy.applyResizeSplits(midPos, mSplitLayout);

    }



    public void setMinimizedDockStack(boolean minimized, long animDuration,

packages/SystemUI/src/com/android/systemui/stackdivider/WindowManagerProxy.java

+2 −3
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ import android.view.WindowManagerGlobal; 
import android.window.TaskOrganizer;

import android.window.WindowContainerToken;

import android.window.WindowContainerTransaction;

import android.window.WindowOrganizer;



import com.android.internal.annotations.GuardedBy;

import com.android.systemui.TransactionPool;
@@ -112,10 +111,10 @@ public class WindowManagerProxy { 
        mExecutor.execute(mSetTouchableRegionRunnable);

    }



    static void applyResizeSplits(int position, SplitDisplayLayout splitLayout) {

    void applyResizeSplits(int position, SplitDisplayLayout splitLayout) {

        WindowContainerTransaction t = new WindowContainerTransaction();

        splitLayout.resizeSplits(position, t);

        WindowOrganizer.applyTransaction(t);

        applySyncTransaction(t);

    }



    private static boolean getHomeAndRecentsTasks(List<ActivityManager.RunningTaskInfo> out,