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

Commit 30444fce authored by Vadim Tryshev's avatar Vadim Tryshev Committed by Android (Google) Code Review
Browse files

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

parents 7471548f 61f076a3
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -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) {
+6 −6
Original line number Diff line number Diff line
@@ -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);
    }
}