Merge "Do not load/release back gesture ML model after every device fold/unfold." into tm-qpr-dev

This commit is contained in:
Cutter Coryell
2022-12-14 22:37:46 +00:00
committed by Android (Google) Code Review

View File

@@ -635,8 +635,9 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack
}
private void updateMLModelState() {
boolean newState = mIsEnabled && DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_SYSTEMUI,
SystemUiDeviceConfigFlags.USE_BACK_GESTURE_ML_MODEL, false);
boolean newState =
mIsGesturalModeEnabled && DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_SYSTEMUI,
SystemUiDeviceConfigFlags.USE_BACK_GESTURE_ML_MODEL, false);
if (newState == mUseMLModel) {
return;
@@ -766,7 +767,7 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack
// ML model
boolean withinMinRange = x < mMLEnableWidth + mLeftInset
|| x >= (mDisplaySize.x - mMLEnableWidth - mRightInset);
if (!withinMinRange && mUseMLModel
if (!withinMinRange && mUseMLModel && !mMLModelIsLoading
&& (results = getBackGesturePredictionsCategory(x, y, app)) != -1) {
withinRange = (results == 1);
}