From 3945f028de26c07a8a1dd36ad4438280d59b7359 Mon Sep 17 00:00:00 2001 From: Tony Wickham Date: Thu, 9 Jun 2022 14:23:17 -0700 Subject: [PATCH 1/3] Revert line that could wrongly initialize RecentsView scroll Test: open a random app that hasn't been opened in a while, touch down on nav handle and see if RecentsView scrolls partially or fully offscreen; repeat 20 times to be sure Bug: 233112195 Fixes: 235369468 Change-Id: Ie8b3dbea7c4826af037edf22360946105ab22134 --- src/com/android/launcher3/PagedView.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java index 73be5beb2c..cba0b7d709 100644 --- a/src/com/android/launcher3/PagedView.java +++ b/src/com/android/launcher3/PagedView.java @@ -1187,7 +1187,9 @@ public abstract class PagedView extends ViewGrou } public int getScrollForPage(int index) { - if (!pageScrollsInitialized() || index >= mPageScrolls.length || index < 0) { + // TODO(b/233112195): Use !pageScrollsInitialized() instead of mPageScrolls == null, once we + // root cause where we should be using runOnPageScrollsInitialized(). + if (mPageScrolls == null || index >= mPageScrolls.length || index < 0) { return 0; } else { return mPageScrolls[index]; From 2345fee56630ccabdc67acbb050b267a995edbf3 Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Tue, 14 Jun 2022 21:20:05 +0000 Subject: [PATCH 2/3] Snap to running task if it's offscreen when back is invoked - If the user has scrolled the running task offscreen, then snap back to the task if back is invoked. Bug: 233952141 Test: Swipe to overview, scroll away from the current task and then go back Change-Id: Icc5040d4b38c97e0329f937e24bd517a71a32f13 --- .../launcher3/uioverrides/states/OverviewState.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java index 429f209e94..6427e0981a 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java +++ b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java @@ -131,9 +131,14 @@ public class OverviewState extends LauncherState { @Override public void onBackPressed(Launcher launcher) { - TaskView taskView = launcher.getOverviewPanel().getRunningTaskView(); + RecentsView recentsView = launcher.getOverviewPanel(); + TaskView taskView = recentsView.getRunningTaskView(); if (taskView != null) { - taskView.launchTasks(); + if (recentsView.isTaskViewFullyVisible(taskView)) { + taskView.launchTasks(); + } else { + recentsView.snapToPage(recentsView.indexOfChild(taskView)); + } } else { super.onBackPressed(launcher); } From 6677fa3cf3f8d29f2f1bbc0e0ead6d6a2d00372d Mon Sep 17 00:00:00 2001 From: hyunyoungs Date: Tue, 14 Jun 2022 17:03:47 -0700 Subject: [PATCH 3/3] Remove hideKeyboard exception in the log Bug: 235616419 Test: no error stack trace Change-Id: Ice5a52edaed2fb0485696a4586552792b0b5b932 --- src/com/android/launcher3/util/UiThreadHelper.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/com/android/launcher3/util/UiThreadHelper.java b/src/com/android/launcher3/util/UiThreadHelper.java index 8df3f8a129..7e6711f806 100644 --- a/src/com/android/launcher3/util/UiThreadHelper.java +++ b/src/com/android/launcher3/util/UiThreadHelper.java @@ -69,10 +69,6 @@ public class UiThreadHelper { activityContext.getStatsLogManager().logger() .log(LAUNCHER_ALLAPPS_KEYBOARD_CLOSED); return; - } else { - // print which stack trace failed. - Log.e("Launcher", "hideKeyboard ignored.", new Exception()); - // Then attempt to use the old logic. } } // Since the launcher context cannot be accessed directly from callback, adding secondary