Merge "Do not load/release back gesture ML model after every device fold/unfold." into tm-qpr-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
3fa0c1ffb3
@@ -635,8 +635,9 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void updateMLModelState() {
|
private void updateMLModelState() {
|
||||||
boolean newState = mIsEnabled && DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_SYSTEMUI,
|
boolean newState =
|
||||||
SystemUiDeviceConfigFlags.USE_BACK_GESTURE_ML_MODEL, false);
|
mIsGesturalModeEnabled && DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_SYSTEMUI,
|
||||||
|
SystemUiDeviceConfigFlags.USE_BACK_GESTURE_ML_MODEL, false);
|
||||||
|
|
||||||
if (newState == mUseMLModel) {
|
if (newState == mUseMLModel) {
|
||||||
return;
|
return;
|
||||||
@@ -766,7 +767,7 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack
|
|||||||
// ML model
|
// ML model
|
||||||
boolean withinMinRange = x < mMLEnableWidth + mLeftInset
|
boolean withinMinRange = x < mMLEnableWidth + mLeftInset
|
||||||
|| x >= (mDisplaySize.x - mMLEnableWidth - mRightInset);
|
|| x >= (mDisplaySize.x - mMLEnableWidth - mRightInset);
|
||||||
if (!withinMinRange && mUseMLModel
|
if (!withinMinRange && mUseMLModel && !mMLModelIsLoading
|
||||||
&& (results = getBackGesturePredictionsCategory(x, y, app)) != -1) {
|
&& (results = getBackGesturePredictionsCategory(x, y, app)) != -1) {
|
||||||
withinRange = (results == 1);
|
withinRange = (results == 1);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user