From 3b6b03b756574f65cef26f1b961a8f172495894c Mon Sep 17 00:00:00 2001 From: "sfufa@google.com" Date: Mon, 4 Oct 2021 13:09:40 -0700 Subject: [PATCH] [Search] Introduce feature flag ENABLE_ONE_SEARCH Bug: 201781284 Test: Manual Change-Id: I31f8b6fe5664c874e4c9605a1d174807b6170df0 --- .../launcher3/config/FeatureFlags.java | 3 +++ .../touch/AllAppsSwipeController.java | 24 +++++++++++++++---- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java index 61f314ca92..ec077de64e 100644 --- a/src/com/android/launcher3/config/FeatureFlags.java +++ b/src/com/android/launcher3/config/FeatureFlags.java @@ -97,6 +97,9 @@ public final class FeatureFlags { public static final BooleanFlag ENABLE_DEVICE_SEARCH = new DeviceFlag( "ENABLE_DEVICE_SEARCH", true, "Allows on device search in all apps"); + public static final BooleanFlag ENABLE_ONE_SEARCH = new DeviceFlag("ENABLE_ONE_SEARCH", false, + "Use homescreen search box to complete allApps searches"); + public static final BooleanFlag ENABLE_DEVICE_SEARCH_PERFORMANCE_LOGGING = new DeviceFlag( "ENABLE_DEVICE_SEARCH_PERFORMANCE_LOGGING", true, "Allows on device search in all apps logging"); diff --git a/src/com/android/launcher3/touch/AllAppsSwipeController.java b/src/com/android/launcher3/touch/AllAppsSwipeController.java index 4894b3b08f..989a9e4c24 100644 --- a/src/com/android/launcher3/touch/AllAppsSwipeController.java +++ b/src/com/android/launcher3/touch/AllAppsSwipeController.java @@ -94,12 +94,28 @@ public class AllAppsSwipeController extends AbstractStateChangeTouchController { LauncherState toState) { StateAnimationConfig config = super.getConfigForStates(fromState, toState); if (fromState == NORMAL && toState == ALL_APPS) { - config.setInterpolator(ANIM_SCRIM_FADE, ALLAPPS_STAGGERED_FADE_EARLY_RESPONDER); - config.setInterpolator(ANIM_ALL_APPS_FADE, ALLAPPS_STAGGERED_FADE_LATE_RESPONDER); + applyNormalToAllAppsAnimConfig(config); } else if (fromState == ALL_APPS && toState == NORMAL) { - config.setInterpolator(ANIM_SCRIM_FADE, ALLAPPS_STAGGERED_FADE_LATE_RESPONDER); - config.setInterpolator(ANIM_ALL_APPS_FADE, ALLAPPS_STAGGERED_FADE_EARLY_RESPONDER); + applyAllAppsToNormalConfig(config); } return config; } + + /** + * Applies Animation config values for transition from all apps to home + */ + public static void applyAllAppsToNormalConfig(StateAnimationConfig config) { + config.setInterpolator(ANIM_SCRIM_FADE, ALLAPPS_STAGGERED_FADE_LATE_RESPONDER); + config.setInterpolator(ANIM_ALL_APPS_FADE, ALLAPPS_STAGGERED_FADE_EARLY_RESPONDER); + } + + /** + * Applies Animation config values for transition from home to all apps + */ + public static void applyNormalToAllAppsAnimConfig(StateAnimationConfig config) { + config.setInterpolator(ANIM_SCRIM_FADE, ALLAPPS_STAGGERED_FADE_EARLY_RESPONDER); + config.setInterpolator(ANIM_ALL_APPS_FADE, ALLAPPS_STAGGERED_FADE_LATE_RESPONDER); + } + + }