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

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

Merge "Fix bug where All Apps Edu gets closed via user input before animation... 

Merge "Fix bug where All Apps Edu gets closed via user input before animation ends." into ub-launcher3-rvc-dev am: 8e9405d7

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/11917527

Change-Id: If9c7c4f6070e1e941b1d2250ab4d63a99266f59f
parents 7c80084f 8e9405d7

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java

+5 −1
Original line number Diff line number Diff line
@@ -15,10 +15,13 @@ 
 */

package com.android.launcher3.uioverrides.touchcontrollers;



import static com.android.launcher3.AbstractFloatingView.TYPE_ALL;

import static com.android.launcher3.AbstractFloatingView.TYPE_ALL_APPS_EDU;

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

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

import static com.android.launcher3.allapps.AllAppsTransitionController.ALL_APPS_PROGRESS;

import static com.android.launcher3.anim.Interpolators.DEACCEL_3;

import static com.android.launcher3.config.FeatureFlags.ENABLE_ALL_APPS_EDU;

import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;

import static com.android.launcher3.touch.AbstractStateChangeTouchController.SUCCESS_TRANSITION_PROGRESS;

import static com.android.quickstep.views.RecentsView.ADJACENT_PAGE_OFFSET;
@@ -112,7 +115,8 @@ public class NavBarToHomeTouchController implements TouchController, 
            }

            return true;

        }

        if (AbstractFloatingView.getTopOpenView(mLauncher) != null) {

        int typeToClose = ENABLE_ALL_APPS_EDU.get() ? TYPE_ALL & ~TYPE_ALL_APPS_EDU : TYPE_ALL;

        if (AbstractFloatingView.getTopOpenViewWithType(mLauncher, typeToClose) != null) {

            if (TestProtocol.sDebugTracing) {

                Log.d(TestProtocol.PAUSE_NOT_DETECTED,

                        "NavBarToHomeTouchController.canInterceptTouch true 2 "

quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java

+3 −2
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 
package com.android.launcher3.uioverrides.touchcontrollers;



import static com.android.launcher3.AbstractFloatingView.TYPE_ACCESSIBLE;

import static com.android.launcher3.AbstractFloatingView.TYPE_ALL_APPS_EDU;

import static com.android.launcher3.AbstractFloatingView.getTopOpenViewWithType;

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

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

import static com.android.launcher3.LauncherState.OVERVIEW;
@@ -36,7 +38,6 @@ import android.util.Log; 
import android.view.MotionEvent;

import android.view.animation.Interpolator;



import com.android.launcher3.AbstractFloatingView;

import com.android.launcher3.DeviceProfile;

import com.android.launcher3.Launcher;

import com.android.launcher3.LauncherState;
@@ -124,7 +125,7 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr 
                return false;

            }

        }

        if (AbstractFloatingView.getTopOpenViewWithType(mLauncher, TYPE_ACCESSIBLE) != null) {

        if (getTopOpenViewWithType(mLauncher, TYPE_ACCESSIBLE | TYPE_ALL_APPS_EDU) != null) {

            return false;

        }

        return true;

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

+1 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ public class QuickstepOnboardingPrefs extends OnboardingPrefs<BaseQuickstepLaunc 
                @Override

                public void onStateTransitionComplete(LauncherState finalState) {

                    if (finalState == NORMAL) {

                        if (mCount == MAX_NUM_SWIPES_TO_TRIGGER_EDU) {

                        if (mCount >= MAX_NUM_SWIPES_TO_TRIGGER_EDU) {

                            if (getOpenView(mLauncher, TYPE_ALL_APPS_EDU) == null) {

                                AllAppsEduView.show(launcher);

                            }