Merge "Accumulating tab presses during animations" into ub-launcher3-master

2 files changed, 8 insertions, 8 deletions

diff --git a/quickstep/src/com/android/quickstep/OverviewCommandHelper.java b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
index b1afff524..efca9ebb1 100644
--- a/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
+++ b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
@@ -93,7 +93,7 @@ public class OverviewCommandHelper extends InternalStateHandler {
     public void onOverviewShown() {
         if (isOverviewAlmostVisible()) {
             final RecentsView rv = getLauncher().getOverviewPanel();
-            rv.selectNextTask();
+            rv.snapToTaskAfterNext();
         } else {
             openRecents();
         }
@@ -101,7 +101,7 @@ public class OverviewCommandHelper extends InternalStateHandler {
 
     public void onOverviewHidden() {
         final RecentsView rv = getLauncher().getOverviewPanel();
-        rv.launchCurrentTask();
+        rv.launchNextTask();
     }
 
     private void startNonLauncherTask(int backStackCount) {
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index f6eed5809..9c0e580cb 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -613,7 +613,7 @@ public abstract class RecentsView<T extends BaseActivity>
     public boolean dispatchKeyEvent(KeyEvent event) {
         if (event.getKeyCode() == KeyEvent.KEYCODE_TAB
                 && event.getAction() == KeyEvent.ACTION_DOWN) {
-            setCurrentPage((getCurrentPage()
+            snapToPage((getNextPage()
                     + (event.isShiftPressed() ? getPageCount() - 1 : 1)) % getPageCount());
             loadVisibleTaskData();
             return true;
@@ -621,13 +621,13 @@ public abstract class RecentsView<T extends BaseActivity>
         return super.dispatchKeyEvent(event);
     }
 
-    public void selectNextTask() {
-        setCurrentPage((getCurrentPage() + 1) % getPageCount());
+    public void snapToTaskAfterNext() {
+        snapToPage((getNextPage() + 1) % getPageCount());
         loadVisibleTaskData();
     }
 
-    public void launchCurrentTask() {
-        final TaskView currentTask = (TaskView) getChildAt(getCurrentPage());
-        currentTask.launchTask(true);
+    public void launchNextTask() {
+        final TaskView nextTask = (TaskView) getChildAt(getNextPage());
+        nextTask.launchTask(true);
     }
 }