commit ad51bc1df2d6aada03c0e052e093199efaf9cc93
author Sam Cackett <samcackett@google.com> Mon Jan 08 14:40:05 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jan 08 14:40:05 2024 +0000
tree a9508d02b6cc386c89f1fbdfeb1cea378c81de4e
parent d4d4eaaf316ef8c65936484bcab166c77af68798
parent 191b13e8d06bc67e7c7914d81ac9302be1404d37

Merge "Reset AppChip chevron when closed" into main

quickstep/src/com/android/quickstep/views/TaskMenuView.java

diff --git a/quickstep/src/com/android/quickstep/views/TaskMenuView.java b/quickstep/src/com/android/quickstep/views/TaskMenuView.java
index cf89d2e..77033b2 100644
--- a/quickstep/src/com/android/quickstep/views/TaskMenuView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskMenuView.java
@@ -115,9 +115,6 @@
             animateClose();
         } else {
             closeComplete();
-            if (enableOverviewIconMenu()) {
-                ((IconAppChipView) mTaskContainer.getIconView()).reset();
-            }
         }
     }
 
@@ -378,9 +375,18 @@
 
     private void closeComplete() {
         mIsOpen = false;
+        resetOverviewIconMenu();
         mActivity.getDragLayer().removeView(this);
     }
 
+    private void resetOverviewIconMenu() {
+        if (enableOverviewIconMenu()) {
+            ((IconAppChipView) mTaskContainer.getIconView()).reset();
+            setTranslationY(mMenuTranslationYBeforeOpen);
+            mTaskContainer.getIconView().asView().setTranslationY(mIconViewTranslationYBeforeOpen);
+        }
+    }
+
     private RoundedRectRevealOutlineProvider createOpenCloseOutlineProvider() {
         float radius = TaskCornerRadius.get(mContext);
         Rect fromRect = new Rect(