From e16a2725d2d0b1ca90ee2002d6f104c3450c49fc Mon Sep 17 00:00:00 2001 From: Brandon Dayauon Date: Tue, 28 May 2024 15:49:58 -0700 Subject: [PATCH] Create a bug fix flag for the FloatingMaskView. Need to create a bug-fix flag since feature flags can't reach nextfood in time for V. We do this by renaming the current flag. According to https://g3doc.corp.google.com/company/teams/android-core-experiments/trunk-stable/gantry-stages/bug-fix.md?cl=head After a flag declaration has been merged, it's no longer possible to change its purpose. If the purpose of a flag changes over time, simply rename the flag; this will create a new workflow and invalidate the previous workflow. In cases where renaming is not possible, please file a bug for the ACE oncall. Even when re-using the name of a flag for a new purpose, please note that all the progress in the pre-existing workflow will be lost; the new bug-fix workflow will start from scratch. bug: 339850589 Test: Presubmit/locally adb shell device_config put launcher_search com.android.launcher3.private_space_add_floating_mask_view true Flag: ACONFIG com.android.launcher3.private_space_add_floating_mask_view STAGING Change-Id: Iffbc6a93c4ef6bbe121e0c8fb83250174f367b9d --- aconfig/launcher_search.aconfig | 5 ++++- src/com/android/launcher3/allapps/PrivateProfileManager.java | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/aconfig/launcher_search.aconfig b/aconfig/launcher_search.aconfig index b243922a29..b98eee6e32 100644 --- a/aconfig/launcher_search.aconfig +++ b/aconfig/launcher_search.aconfig @@ -45,8 +45,11 @@ flag { flag { - name: "private_space_floating_mask_view" + name: "private_space_add_floating_mask_view" namespace: "launcher_search" description: "This flag enables the floating mask view as part of the Private Space animation. " bug: "339850589" + metadata { + purpose: PURPOSE_BUGFIX + } } diff --git a/src/com/android/launcher3/allapps/PrivateProfileManager.java b/src/com/android/launcher3/allapps/PrivateProfileManager.java index 27340a3678..604201ae7f 100644 --- a/src/com/android/launcher3/allapps/PrivateProfileManager.java +++ b/src/com/android/launcher3/allapps/PrivateProfileManager.java @@ -738,7 +738,7 @@ public class PrivateProfileManager extends UserProfileManager { /** Fades out the private space container. */ private ValueAnimator translateFloatingMaskView(boolean animateIn) { - if (!Flags.privateSpaceFloatingMaskView() || mFloatingMaskView == null) { + if (!Flags.privateSpaceAddFloatingMaskView() || mFloatingMaskView == null) { return new ValueAnimator(); } // Translate base on the height amount. Translates out on expand and in on collapse. @@ -849,7 +849,7 @@ public class PrivateProfileManager extends UserProfileManager { } private void attachFloatingMaskView(boolean expand) { - if (!Flags.privateSpaceFloatingMaskView()) { + if (!Flags.privateSpaceAddFloatingMaskView()) { return; } mFloatingMaskView = (FloatingMaskView) mAllApps.getLayoutInflater().inflate(