Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I987f95a8bbb7c56dbac7ac25437cbea43c945cda
This commit is contained in:
Evan Rosky
2021-02-12 23:56:45 +00:00
committed by Automerger Merge Worker
parent cca000ac52 e7dbe60d32
commit b760ad1f6e
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java
View File

@@ -618,7 +618,7 @@ public class DividerView extends FrameLayout implements OnTouchListener,
mEntranceAnimationRunning = false; mEntranceAnimationRunning = false;
mExitAnimationRunning = false; mExitAnimationRunning = false;
if (!dismissed && !wasMinimizeInteraction) { if (!dismissed && !wasMinimizeInteraction) {
WindowManagerProxy.applyResizeSplits(snapTarget.position, mSplitLayout); mWindowManagerProxy.applyResizeSplits(snapTarget.position, mSplitLayout);
} }
if (mCallback != null) { if (mCallback != null) {
mCallback.onDraggingEnd(); mCallback.onDraggingEnd();
@@ -889,7 +889,7 @@ public class DividerView extends FrameLayout implements OnTouchListener,
t.hide(sc).apply(); t.hide(sc).apply();
mTiles.releaseTransaction(t); mTiles.releaseTransaction(t);
int midPos = mSplitLayout.getSnapAlgorithm().getMiddleTarget().position; int midPos = mSplitLayout.getSnapAlgorithm().getMiddleTarget().position;
WindowManagerProxy.applyResizeSplits(midPos, mSplitLayout); mWindowManagerProxy.applyResizeSplits(midPos, mSplitLayout);
} }
public void setMinimizedDockStack(boolean minimized, long animDuration, public void setMinimizedDockStack(boolean minimized, long animDuration,

5
packages/SystemUI/src/com/android/systemui/stackdivider/WindowManagerProxy.java
View File

@@ -37,7 +37,6 @@ import android.view.WindowManagerGlobal;
import android.window.TaskOrganizer; import android.window.TaskOrganizer;
import android.window.WindowContainerToken; import android.window.WindowContainerToken;
import android.window.WindowContainerTransaction; import android.window.WindowContainerTransaction;
import android.window.WindowOrganizer;
import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.GuardedBy;
import com.android.systemui.TransactionPool; import com.android.systemui.TransactionPool;
@@ -112,10 +111,10 @@ public class WindowManagerProxy {
mExecutor.execute(mSetTouchableRegionRunnable); mExecutor.execute(mSetTouchableRegionRunnable);
} }
static void applyResizeSplits(int position, SplitDisplayLayout splitLayout) { void applyResizeSplits(int position, SplitDisplayLayout splitLayout) {
WindowContainerTransaction t = new WindowContainerTransaction(); WindowContainerTransaction t = new WindowContainerTransaction();
splitLayout.resizeSplits(position, t); splitLayout.resizeSplits(position, t);
WindowOrganizer.applyTransaction(t); applySyncTransaction(t);
} }
private static boolean getHomeAndRecentsTasks(List<ActivityManager.RunningTaskInfo> out, private static boolean getHomeAndRecentsTasks(List<ActivityManager.RunningTaskInfo> out,