Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8676841f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "am-229f9e14-980c-44e5-a5c0-41681fae0652" into ub-launcher3-master 

* changes:
  [automerger] Dismiss task menu view after pinning from tapping menu item am: 89da6799
  Dismiss task menu view after pinning from tapping menu item
parents 54c1af80 19ded6aa

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

+7 −2
Original line number Diff line number Diff line
@@ -152,8 +152,7 @@ public class TaskSystemShortcut<T extends SystemShortcut> extends SystemShortcut 
                            }

                        };



                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 @@ public class TaskSystemShortcut<T extends SystemShortcut> extends SystemShortcut 
                    }

                };

                taskView.launchTask(true, resultCallback, mHandler);

                dismissTaskMenuView(activity);

            };

        }

    }
@@ -265,4 +265,9 @@ public class TaskSystemShortcut<T extends SystemShortcut> extends SystemShortcut 
            return null;

        }

    }



    private static void dismissTaskMenuView(BaseDraggingActivity activity) {

        AbstractFloatingView.closeOpenViews(activity, true,

                AbstractFloatingView.TYPE_ALL & ~AbstractFloatingView.TYPE_REBIND_SAFE);

    }

}