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

Commit 86e18b59 authored by Luca Zuccarini's avatar Luca Zuccarini
Browse files

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
parent 5cc62b13

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

+2 −2
Original line number Diff line number Diff line
@@ -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

src/com/android/launcher3/model/data/ItemInfo.java

+1 −4
Original line number Diff line number Diff line
@@ -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;

    }



    /**