openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Don't show shelf bounce when there's no shelf in Overview" into ub-launcher3-rvc-dev

This commit is contained in:
TreeHugger Robot 2020-04-20 22:30:40 +00:00 committed by Android (Google) Code Review
parent f66e7c19bd 853ac99e47
commit e922b06cf4
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
quickstep/src/com/android/quickstep/util/QuickstepOnboardingPrefs.java
View File

@ -18,6 +18,8 @@ package com.android.quickstep.util;
import static com.android.launcher3.LauncherState.ALL_APPS; import static com.android.launcher3.LauncherState.ALL_APPS;
import static com.android.launcher3.LauncherState.NORMAL; import static com.android.launcher3.LauncherState.NORMAL;
import static com.android.launcher3.LauncherState.OVERVIEW; import static com.android.launcher3.LauncherState.OVERVIEW;
import static com.android.launcher3.config.FeatureFlags.ENABLE_OVERVIEW_ACTIONS;
import static com.android.quickstep.SysUINavigationMode.removeShelfFromOverview;
import android.content.SharedPreferences; import android.content.SharedPreferences;
@ -58,7 +60,14 @@ public class QuickstepOnboardingPrefs extends OnboardingPrefs<BaseQuickstepLaunc
}); });
} }
if (!getBoolean(SHELF_BOUNCE_SEEN)) { boolean shelfBounceSeen = getBoolean(SHELF_BOUNCE_SEEN);
if (!shelfBounceSeen && ENABLE_OVERVIEW_ACTIONS.get()
&& removeShelfFromOverview(launcher)) {
// There's no shelf in overview, so don't bounce it (can't get to all apps anyway).
shelfBounceSeen = true;
mSharedPrefs.edit().putBoolean(SHELF_BOUNCE_SEEN, shelfBounceSeen).apply();
}
if (!shelfBounceSeen) {
mStateManager.addStateListener(new StateListener() { mStateManager.addStateListener(new StateListener() {
@Override @Override
public void onStateTransitionStart(LauncherState toState) { } public void onStateTransitionStart(LauncherState toState) { }