commit 1016bf410d5c9e5ed61625674ca0c59c0402d7f9
author TreeHugger Robot <treehugger-gerrit@google.com> Sat Apr 25 06:21:30 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Apr 25 06:21:30 2020 +0000
tree 02534dd95bdca23274aef4f644c2b9786278bee8
parent 00dc219309c1ed5c662a31edb1723c591aedc645
parent 08f9a5878d03deb4e4d9bbb294e53a38f390775c

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

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

diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java b/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java
index ea71d97..81d4224 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java
@@ -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 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;