Merge "Add boolean controlling ML in system back gesture" into main
diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml
index 64a1d24..17719d1 100644
--- a/packages/SystemUI/res/values/config.xml
+++ b/packages/SystemUI/res/values/config.xml
@@ -1002,4 +1002,7 @@
<item>com.android.switchaccess.SwitchAccessService</item>
<item>com.google.android.apps.accessibility.voiceaccess.JustSpeakService</item>
</string-array>
+
+ <!-- Whether to use a machine learning model for back gesture falsing. -->
+ <bool name="config_useBackGestureML">true</bool>
</resources>
diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java b/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java
index e660b97..0d641ac 100644
--- a/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java
+++ b/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java
@@ -758,7 +758,8 @@
}
private void updateMLModelState() {
- boolean newState = mIsGestureHandlingEnabled && DeviceConfig.getBoolean(
+ boolean newState = mIsGestureHandlingEnabled && mContext.getResources().getBoolean(
+ R.bool.config_useBackGestureML) && DeviceConfig.getBoolean(
DeviceConfig.NAMESPACE_SYSTEMUI,
SystemUiDeviceConfigFlags.USE_BACK_GESTURE_ML_MODEL, false);