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

Commit d59848e0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Don't show shelf bounce when there's no shelf in Overview" into... 

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

Change-Id: Ie0db510b635d49228d155cbc3c838ad391c3fde1
parents 441790c4 e922b06c

quickstep/src/com/android/quickstep/util/QuickstepOnboardingPrefs.java

+10 −1
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ package com.android.quickstep.util; 
import static com.android.launcher3.LauncherState.ALL_APPS;

import static com.android.launcher3.LauncherState.NORMAL;

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;
@@ -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() {

                @Override

                public void onStateTransitionStart(LauncherState toState) { }