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

Commit acf07f33 authored by Fedor Kudasov's avatar Fedor Kudasov Committed by Automerger Merge Worker
Browse files

Simplify getTaskViewAt call am: 9d6fb64f

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16249427

Change-Id: If52c26a38fab17d294b08a34a3e41fd5f88cef27
parents 913c8aee 9d6fb64f
Loading
Loading
Loading
Loading
+4 −3
Original line number Original line Diff line number Diff line
@@ -117,11 +117,12 @@ public class OverviewCommandHelper {
        mPendingCommands.clear();
        mPendingCommands.clear();
    }
    }


    @Nullable
    private TaskView getNextTask(RecentsView view) {
    private TaskView getNextTask(RecentsView view) {
        final TaskView runningTaskView = view.getRunningTaskView();
        final TaskView runningTaskView = view.getRunningTaskView();


        if (runningTaskView == null) {
        if (runningTaskView == null) {
            return view.getTaskViewCount() > 0 ? view.getTaskViewAt(0) : null;
            return view.getTaskViewAt(0);
        } else {
        } else {
            final TaskView nextTask = view.getNextTaskView();
            final TaskView nextTask = view.getNextTaskView();
            return nextTask != null ? nextTask : runningTaskView;
            return nextTask != null ? nextTask : runningTaskView;
@@ -256,8 +257,8 @@ public class OverviewCommandHelper {
                // Ensure that recents view has focus so that it receives the followup key inputs
                // Ensure that recents view has focus so that it receives the followup key inputs
                TaskView taskView = rv.getNextTaskView();
                TaskView taskView = rv.getNextTaskView();
                if (taskView == null) {
                if (taskView == null) {
                    if (rv.getTaskViewCount() > 0) {
                    taskView = rv.getTaskViewAt(0);
                    taskView = rv.getTaskViewAt(0);
                    if (taskView != null) {
                        taskView.requestFocus();
                        taskView.requestFocus();
                    } else {
                    } else {
                        rv.requestFocus();
                        rv.requestFocus();