aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-27 23:36:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Update worksace page indicator during HINT_STATE transition" into ub-launcher3-master

Browse Source
This commit is contained in:
TreeHugger Robot
2020-08-18 23:35:09 +00:00
committed by Android (Google) Code Review
parent 217dbfea01 1fbab3ad2c
commit a92c26b161
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/launcher3/Workspace.java
View File

@@ -22,6 +22,7 @@ import static com.android.launcher3.LauncherState.ALL_APPS;
import static com.android.launcher3.LauncherState.FLAG_MULTI_PAGE;
import static com.android.launcher3.LauncherState.FLAG_WORKSPACE_ICONS_CAN_BE_DRAGGED;
import static com.android.launcher3.LauncherState.FLAG_WORKSPACE_INACCESSIBLE;
import static com.android.launcher3.LauncherState.HINT_STATE;
import static com.android.launcher3.LauncherState.NORMAL;
import static com.android.launcher3.LauncherState.OVERVIEW;
import static com.android.launcher3.LauncherState.SPRING_LOADED;
@@ -943,7 +944,10 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
super.onScrollChanged(l, t, oldl, oldt);
// Update the page indicator progress.
boolean isTransitioning = mIsSwitchingState
// Unlike from other states, we show the page indicator when transitioning from HINT_STATE.
boolean isSwitchingState = mIsSwitchingState
&& mLauncher.getStateManager().getCurrentStableState() != HINT_STATE;
boolean isTransitioning = isSwitchingState
|| (getLayoutTransition() != null && getLayoutTransition().isRunning());
if (!isTransitioning) {
showPageIndicatorAtCurrentScroll();