commit 8383a33f59d9e8be7b170504a2e3101cbecea5f1
author Riley Jones <jonesriley@google.com> Sat Jan 27 00:24:51 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Jan 27 00:24:51 2024 +0000
tree ce02bf858628fb29a5b3c1b7a005ccd62ca49c3f
parent 220ea939ef3d74b04ebae27d01f05fc3395feb99
parent 6858b72c982a54d2ddbf89e4bf94e87183826bf0

Merge "Fix to prevent animated tuck repeating." into main

packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/MenuView.java

diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/MenuView.java b/packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/MenuView.java
index 334cc87..035ccbd 100644
--- a/packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/MenuView.java
+++ b/packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/MenuView.java
@@ -226,15 +226,15 @@
             // onArrivalAtPosition() is called at the end of the animation.
         } else {
             mMenuAnimationController.moveToPosition(position);
-            onArrivalAtPosition(); // no animation, so we call this immediately.
+            onArrivalAtPosition(true); // no animation, so we call this immediately.
         }
     }
 
-    void onArrivalAtPosition() {
+    void onArrivalAtPosition(boolean moveToEdgeIfTucked) {
         final PointF position = getMenuPosition();
         onBoundsInParentChanged((int) position.x, (int) position.y);
 
-        if (isMoveToTucked()) {
+        if (isMoveToTucked() && moveToEdgeIfTucked) {
             mMenuAnimationController.moveToEdgeAndHide();
         }
     }

packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/MenuViewLayer.java

diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/MenuViewLayer.java b/packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/MenuViewLayer.java
index 3acf80d..f2e9531 100644
--- a/packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/MenuViewLayer.java
+++ b/packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/MenuViewLayer.java
@@ -446,7 +446,7 @@
             }
         }
         if (Flags.floatingMenuImeDisplacementAnimation()) {
-            mMenuView.onArrivalAtPosition();
+            mMenuView.onArrivalAtPosition(false);
         }
     }