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

Commit 625d3755 authored by Samuel Fufa's avatar Samuel Fufa Committed by Automerger Merge Worker
Browse files

Merge "[Search] Introduce feature flag ENABLE_ONE_SEARCH" into sc-v2-dev am: d9422872 

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

Change-Id: Ic89fcfebfbb1840e0001612518a134be76ebc243
parents 7ca1aba4 d9422872

src/com/android/launcher3/config/FeatureFlags.java

+3 −0
Original line number Diff line number Diff line
@@ -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");

src/com/android/launcher3/touch/AllAppsSwipeController.java

+20 −4
Original line number Diff line number Diff line
@@ -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) {

            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);

    }

        return config;



    /**

     * 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);

    }





}