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

Commit 1016bf41 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Don't scale workspace when going to all apps if... 

Merge "Don't scale workspace when going to all apps if ENABLE_OVERVIEW_ACTIONS" into ub-launcher3-rvc-dev
parents 00dc2193 08f9a587

quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java

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



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

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

import static com.android.quickstep.SysUINavigationMode.Mode.NO_BUTTON;



import android.content.Context;
@@ -76,7 +78,7 @@ public class AllAppsState extends LauncherState { 
    public ScaleAndTranslation getWorkspaceScaleAndTranslation(Launcher launcher) {

        ScaleAndTranslation scaleAndTranslation = LauncherState.OVERVIEW

                .getWorkspaceScaleAndTranslation(launcher);

        if (SysUINavigationMode.getMode(launcher) == SysUINavigationMode.Mode.NO_BUTTON) {

        if (SysUINavigationMode.getMode(launcher) == NO_BUTTON && !ENABLE_OVERVIEW_ACTIONS.get()) {

            float normalScale = 1;

            // Scale down halfway to where we'd be in overview, to prepare for a potential pause.

            scaleAndTranslation.scale = (scaleAndTranslation.scale + normalScale) / 2;