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

Commit d2b80d21 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 8730901 from 76e688b7 to tm-d1-release 

Change-Id: Iac3a5b48504f0c180e06f5355d64b60d069857c6
parents 7e3e1ca9 76e688b7

quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java

+7 −2
Original line number Diff line number Diff line
@@ -131,9 +131,14 @@ public class OverviewState extends LauncherState { 


    @Override

    public void onBackPressed(Launcher launcher) {

        TaskView taskView = launcher.<RecentsView>getOverviewPanel().getRunningTaskView();

        RecentsView recentsView = launcher.getOverviewPanel();

        TaskView taskView = recentsView.getRunningTaskView();

        if (taskView != null) {

            if (recentsView.isTaskViewFullyVisible(taskView)) {

                taskView.launchTasks();

            } else {

                recentsView.snapToPage(recentsView.indexOfChild(taskView));

            }

        } else {

            super.onBackPressed(launcher);

        }

src/com/android/launcher3/PagedView.java

+3 −1
Original line number Diff line number Diff line
@@ -1187,7 +1187,9 @@ public abstract class PagedView<T extends View & PageIndicator> 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];

src/com/android/launcher3/util/UiThreadHelper.java

+0 −4
Original line number Diff line number Diff line
@@ -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