PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update default value for container launch animations to TEAMFOOD." into udc-qpr-dev am: 36e7df0d47

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

Change-Id: Ic0e5fa59c9d962fac63c8daefb995f09493b47e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Luca Zuccarini
2023-07-31 19:54:06 +00:00
committed by Automerger Merge Worker
parent 0668e712e6 36e7df0d47
commit dd7a915c45
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/config/FeatureFlags.java
+2 -2
View File
@@ -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
View File
@@ -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;
}
/**