diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2019-04-03 16:44:32 -0700 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2019-04-03 17:02:36 -0700 |
| commit | 9e84e0c1c1e375e11ea6fa81b448dfe1cddd8b20 (patch) | |
| tree | 369eb678aec67f475b8f657b9dd427412ae2926d /quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java | |
| parent | 5fadfe562c080d6b73e002cfba3ce3194d499c53 (diff) | |
| download | android_packages_apps_Trebuchet-9e84e0c1c1e375e11ea6fa81b448dfe1cddd8b20.tar.gz android_packages_apps_Trebuchet-9e84e0c1c1e375e11ea6fa81b448dfe1cddd8b20.tar.bz2 android_packages_apps_Trebuchet-9e84e0c1c1e375e11ea6fa81b448dfe1cddd8b20.zip | |
Removing SWIPE_HOME flag and using sysUI mode instead
Bug: 129873705
Change-Id: Ieaa7d7928427daed98538c616bdf58b28d295829
Diffstat (limited to 'quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java')
| -rw-r--r-- | quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java index 91a31ddfe..81090c1c9 100644 --- a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java +++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java @@ -36,11 +36,12 @@ import com.android.launcher3.LauncherState; import com.android.launcher3.LauncherStateManager; import com.android.launcher3.Utilities; import com.android.launcher3.anim.AnimatorSetBuilder; -import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.touch.AbstractStateChangeTouchController; import com.android.launcher3.touch.SwipeDetector; import com.android.launcher3.userevent.nano.LauncherLogProto; import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Direction; +import com.android.quickstep.SysUINavigationMode; +import com.android.quickstep.SysUINavigationMode.Mode; import com.android.quickstep.views.RecentsView; import com.android.quickstep.views.TaskView; @@ -105,7 +106,7 @@ public class QuickSwitchTouchController extends AbstractStateChangeTouchControll private void setupInterpolators(AnimatorSetBuilder animatorSetBuilder) { animatorSetBuilder.setInterpolator(ANIM_WORKSPACE_FADE, DEACCEL_2); animatorSetBuilder.setInterpolator(ANIM_ALL_APPS_FADE, DEACCEL_2); - if (FeatureFlags.SWIPE_HOME.get()) { + if (SysUINavigationMode.getMode(mLauncher) == Mode.NO_BUTTON) { // Overview lives to the left of workspace, so translate down later than over animatorSetBuilder.setInterpolator(ANIM_WORKSPACE_TRANSLATE, ACCEL_2); animatorSetBuilder.setInterpolator(ANIM_VERTICAL_PROGRESS, ACCEL_2); |