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

Merge "Set resizing to false if no fling animation" into sc-v2-dev am: 6366de237e

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

Change-Id: Ibb73c3e907456da78b4a058b4360e9efc9b1a876
This commit is contained in:
Tony Huang
2021-07-05 06:20:12 +00:00
committed by Automerger Merge Worker
parent fe8331a6b1 6366de237e
commit bf931a7a3b
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitLayout.java
View File

@@ -286,7 +286,11 @@ public final class SplitLayout {
} }
private void flingDividePosition(int from, int to) { private void flingDividePosition(int from, int to) {
if (from == to) return; if (from == to) {
// No animation run, it should stop resizing here.
mSplitWindowManager.setResizingSplits(false);
return;
}
ValueAnimator animator = ValueAnimator ValueAnimator animator = ValueAnimator
.ofInt(from, to) .ofInt(from, to)
.setDuration(250); .setDuration(250);

1
libs/WindowManager/Shell/src/com/android/wm/shell/legacysplitscreen/DividerView.java
View File

@@ -460,6 +460,7 @@ public class DividerView extends FrameLayout implements OnTouchListener,
private void stopDragging() { private void stopDragging() {
mHandle.setTouching(false, true /* animate */); mHandle.setTouching(false, true /* animate */);
mWindowManager.setSlippery(true); mWindowManager.setSlippery(true);
mWindowManagerProxy.setResizing(false);
releaseBackground(); releaseBackground();
} }