Merge "Make sure DividerFreeSnapMode work as expected" into udc-qpr-dev am: 8e9d05efac

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

Change-Id: If36bbb17f3af9383e39a78317d49d7cf64aa9637
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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

@@ -434,7 +434,7 @@ public class DividerView extends FrameLayout implements View.OnTouchListener {
                 "Set divider bar %s from %s", interactive ? "interactive" : "non-interactive",
                 from);
         mInteractive = interactive;
-        if (!mInteractive && mMoving) {
+        if (!mInteractive && hideHandle && mMoving) {
             final int position = mSplitLayout.getDividePosition();
             mSplitLayout.flingDividePosition(
                     mLastDraggingPosition,

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

@@ -323,7 +323,11 @@ public class SplitDecorManager extends WindowlessWindowManager {
             }
         }
         if (mShown) {
-            fadeOutDecor(()-> animFinishedCallback.accept(true));
+            fadeOutDecor(()-> {
+                if (mRunningAnimationCount == 0 && animFinishedCallback != null) {
+                    animFinishedCallback.accept(true);
+                }
+            });
         } else {
             // Decor surface is hidden so release it directly.
             releaseDecor(t);

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

@@ -593,9 +593,6 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange
     void flingDividePosition(int from, int to, int duration,
             @Nullable Runnable flingFinishedCallback) {
         if (from == to) {
-            // No animation run, still callback to stop resizing.
-            mSplitLayoutHandler.onLayoutSizeChanged(this);
-
             if (flingFinishedCallback != null) {
                 flingFinishedCallback.run();
             }