commit b8d96feed1e0d413fa9268c917ea1705397aeb75
author Johannes Gallmann <gallmann@google.com> Thu Dec 21 10:44:55 2023 +0000
committer Johannes Gallmann <gallmann@google.com> Thu Dec 28 11:21:47 2023 +0000
tree c1a061f2177117734665636cd7b89d5fb167e189
parent d2e0cd602bb985ee64689a8bf443b019d6455781

Migrate predictive back flags to aconfig

Bug: 309545085
Flag: ACONFIG com.android.systemui.predictive_back_sysui DISABLED
Flag: ACONFIG com.android.systemui.predictive_back_animate_shade DISABLED
Flag: ACONFIG com.android.systemui.shade_allow_back_gesture DISABLED
Flag: ACONFIG com.android.systemui.predictive_back_bouncer_anim DISABLED
Test: atest BackActionInteractorTest
Test: atest CentralSurfacesImplTest
Test: atest NotificationPanelViewControllerBaseTest
Test: atest StatusBarKeyguardViewManagerTest
Test: Manual, i.e. testing build on device and verifying behaviour of flagged features
Change-Id: I940233b69957819445cd3efb46ee598a3414e3e8

packages/SystemUI/shared/Android.bp

diff --git a/packages/SystemUI/shared/Android.bp b/packages/SystemUI/shared/Android.bp
index 2b41178..3a26ebf 100644
--- a/packages/SystemUI/shared/Android.bp
+++ b/packages/SystemUI/shared/Android.bp
@@ -66,6 +66,7 @@
         "kotlinx_coroutines",
         "dagger2",
         "jsr330",
+        "com_android_systemui_shared_flags_lib",
     ],
     resource_dirs: [
         "res",

packages/SystemUI/shared/src/com/android/systemui/shared/system/QuickStepContract.java

diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/system/QuickStepContract.java b/packages/SystemUI/shared/src/com/android/systemui/shared/system/QuickStepContract.java
index 131eb6b..c08b083 100644
--- a/packages/SystemUI/shared/src/com/android/systemui/shared/system/QuickStepContract.java
+++ b/packages/SystemUI/shared/src/com/android/systemui/shared/system/QuickStepContract.java
@@ -20,10 +20,11 @@
 import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON;
 import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL;
 
+import static com.android.systemui.shared.Flags.shadeAllowBackGesture;
+
 import android.annotation.IntDef;
 import android.content.Context;
 import android.content.res.Resources;
-import android.os.SystemProperties;
 import android.view.ViewConfiguration;
 import android.view.WindowManagerPolicyConstants;
 
@@ -132,8 +133,7 @@
             SYSUI_STATE_WAKEFULNESS_TRANSITION | SYSUI_STATE_AWAKE;
 
     // Whether the back gesture is allowed (or ignored) by the Shade
-    public static final boolean ALLOW_BACK_GESTURE_IN_SHADE = SystemProperties.getBoolean(
-            "persist.wm.debug.shade_allow_back_gesture", false);
+    public static final boolean ALLOW_BACK_GESTURE_IN_SHADE = shadeAllowBackGesture();
 
     @Retention(RetentionPolicy.SOURCE)
     @IntDef({SYSUI_STATE_SCREEN_PINNING,