From 86e18b59a9a7f4b5eea4328d0fe9cc71fa31dc08 Mon Sep 17 00:00:00 2001 From: Luca Zuccarini Date: Fri, 21 Jul 2023 13:14:24 +0000 Subject: [PATCH] Update default value for container launch animations to TEAMFOOD. Also move flag checking outside ItemInfo. Bug: 262778448 Flag: ENABLE_SEARCH_RESULT_BACKGROUND_DRAWABLES Flag: ENABLE_SEARCH_RESULT_LAUNCH_TRANSITION Test: manual Change-Id: I49de8a93539829e41c1de1fb23630c1b2ca8b646 --- src/com/android/launcher3/config/FeatureFlags.java | 4 ++-- src/com/android/launcher3/model/data/ItemInfo.java | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java index e3e14009ee..542e26d097 100644 --- a/src/com/android/launcher3/config/FeatureFlags.java +++ b/src/com/android/launcher3/config/FeatureFlags.java @@ -83,11 +83,11 @@ public final class FeatureFlags { */ // TODO(Block 1): Clean up flags public static final BooleanFlag ENABLE_SEARCH_RESULT_BACKGROUND_DRAWABLES = getReleaseFlag( - 270394041, "ENABLE_SEARCH_RESULT_BACKGROUND_DRAWABLES", DISABLED, + 270394041, "ENABLE_SEARCH_RESULT_BACKGROUND_DRAWABLES", TEAMFOOD, "Enable option to replace decorator-based search result backgrounds with drawables"); public static final BooleanFlag ENABLE_SEARCH_RESULT_LAUNCH_TRANSITION = getReleaseFlag( - 270394392, "ENABLE_SEARCH_RESULT_LAUNCH_TRANSITION", DISABLED, + 270394392, "ENABLE_SEARCH_RESULT_LAUNCH_TRANSITION", TEAMFOOD, "Enable option to launch search results using the new view container transitions"); // TODO(Block 2): Clean up flags diff --git a/src/com/android/launcher3/model/data/ItemInfo.java b/src/com/android/launcher3/model/data/ItemInfo.java index ba1547f4be..9afa4593a9 100644 --- a/src/com/android/launcher3/model/data/ItemInfo.java +++ b/src/com/android/launcher3/model/data/ItemInfo.java @@ -49,7 +49,6 @@ import com.android.launcher3.LauncherSettings; import com.android.launcher3.LauncherSettings.Animation; import com.android.launcher3.LauncherSettings.Favorites; import com.android.launcher3.Workspace; -import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.logger.LauncherAtom; import com.android.launcher3.logger.LauncherAtom.AllAppsContainer; import com.android.launcher3.logger.LauncherAtom.ContainerInfo; @@ -323,9 +322,7 @@ public class ItemInfo { * Returns whether this item should use the background animation. */ public boolean shouldUseBackgroundAnimation() { - return animationType == LauncherSettings.Animation.VIEW_BACKGROUND - && FeatureFlags.ENABLE_SEARCH_RESULT_BACKGROUND_DRAWABLES.get() - && FeatureFlags.ENABLE_SEARCH_RESULT_LAUNCH_TRANSITION.get(); + return animationType == LauncherSettings.Animation.VIEW_BACKGROUND; } /**