commit 90edc36dd9888fd0f42d9b594c1bcd23da451380
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Jun 11 23:56:09 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 11 23:56:09 2018 +0000
tree ae8b9810117f3ba2e8963a2d00416d71cf755b8a
parent c82c6396e9862220a7227a299d30a73630b3bb94
parent 89da6799e485d3450bd3537e25b8c29c26daacb4

Merge "Dismiss task menu view after pinning from tapping menu item" into ub-launcher3-edmonton-polish

quickstep/src/com/android/quickstep/TaskSystemShortcut.java

diff --git a/quickstep/src/com/android/quickstep/TaskSystemShortcut.java b/quickstep/src/com/android/quickstep/TaskSystemShortcut.java
index f82ff8c..c77d0c7 100644
--- a/quickstep/src/com/android/quickstep/TaskSystemShortcut.java
+++ b/quickstep/src/com/android/quickstep/TaskSystemShortcut.java
@@ -152,8 +152,7 @@
                             }
                         };
 
-                AbstractFloatingView.closeOpenViews(activity, true,
-                        AbstractFloatingView.TYPE_ALL & ~AbstractFloatingView.TYPE_REBIND_SAFE);
+                dismissTaskMenuView(activity);
 
                 final int navBarPosition = WindowManagerWrapper.getInstance().getNavBarPosition();
                 if (navBarPosition == WindowManagerWrapper.NAV_BAR_POS_INVALID) {
@@ -246,6 +245,7 @@
                     }
                 };
                 taskView.launchTask(true, resultCallback, mHandler);
+                dismissTaskMenuView(activity);
             };
         }
     }
@@ -265,4 +265,9 @@
             return null;
         }
     }
+
+    private static void dismissTaskMenuView(BaseDraggingActivity activity) {
+        AbstractFloatingView.closeOpenViews(activity, true,
+                AbstractFloatingView.TYPE_ALL & ~AbstractFloatingView.TYPE_REBIND_SAFE);
+    }
 }