Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76747d43 authored by Cutter Coryell's avatar Cutter Coryell Committed by Automerger Merge Worker
Browse files

Merge "Do not load/release back gesture ML model after every device... 

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20666993



Change-Id: I227f6b836d135b1acb9c55cf6f04b7c4f17e01ad
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6d5ca42f 3fa0c1ff

packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java

+4 −3
Original line number Diff line number Diff line
@@ -635,7 +635,8 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack 
    }



    private void updateMLModelState() {

        boolean newState = mIsEnabled && DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_SYSTEMUI,

        boolean newState =

                mIsGesturalModeEnabled && DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_SYSTEMUI,

                        SystemUiDeviceConfigFlags.USE_BACK_GESTURE_ML_MODEL, false);



        if (newState == mUseMLModel) {
@@ -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);

            }