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

Commit 38e7d522 authored by Tony Wickham's avatar Tony Wickham Committed by Android (Google) Code Review
Browse files

Merge "Don't scroll to home card if overview isn't visible" into ub-launcher3-master

parents 705566df 88d70f2a

.gitignore

deleted100644 → 0
+0 −16
Original line number Diff line number Diff line 
db_files

*.iml

.project

.classpath

.project.properties

gen/

tests/stress/gen/

WallpaperPicker/gen/

WallpaperPicker/.project.properties

bin/

.idea/

.gradle/

local.properties

gradle/

build/

gradlew*
 
 No newline at end of file

quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java

+2 −1
Original line number Diff line number Diff line
@@ -83,7 +83,8 @@ public class RecentsViewStateController implements StateHandler { 


        // Scroll to the workspace card before changing to the NORMAL state.

        int currPage = mRecentsView.getCurrentPage();

        if (toState == NORMAL && currPage != 0 && !config.userControlled) {

        LauncherState fromState = mLauncher.getStateManager().getState();

        if (fromState.overviewUi && toState == NORMAL && currPage != 0 && !config.userControlled) {

            int maxSnapDuration = PagedView.SLOW_PAGE_SNAP_ANIMATION_DURATION;

            int durationPerPage = maxSnapDuration / 10;

            int snapDuration = Math.min(maxSnapDuration, durationPerPage * currPage);