Merge "[Search] Introduce feature flag ENABLE_ONE_SEARCH" into sc-v2-dev (d9422872) · Commits · e / os / android_packages_apps_Trebuchet

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

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


		}