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

Commit 0ed68db0 authored by Maryam Karimzadehgan's avatar Maryam Karimzadehgan Committed by Winson Chung
Browse files

Add flag to get the name of the Model file from the flag in case we want 

to try out different models. In addition, we should not log touches in
the middle of the screen for logging so moving the block at the very
beginning.

Test: unittest, manual test
Bug: 150170384
Change-Id: I6ecb556fea01f26323248b999d17c7b1d1b7eeb7
Merged-In: I6ecb556fea01f26323248b999d17c7b1d1b7eeb7
parent 8c95065c

core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java

+5 −0
Original line number Diff line number Diff line
@@ -433,6 +433,11 @@ public final class SystemUiDeviceConfigFlags { 
     */

    public static final String USE_BACK_GESTURE_ML_MODEL = "use_back_gesture_ml_model";



    /**

     * (string) The name of the ML model for Back Gesture.

     */

    public static final String BACK_GESTURE_ML_MODEL_NAME = "back_gesture_ml_model_name";



    /**

     * (float) Threshold for Back Gesture ML model prediction.

     */

packages/SystemUI/src/com/android/systemui/SystemUIFactory.java

+1 −1
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ public class SystemUIFactory { 
     * This method is overridden in vendor specific implementation of Sys UI.

     */

    public BackGestureTfClassifierProvider createBackGestureTfClassifierProvider(

            AssetManager am) {

            AssetManager am, String modelName) {

        return new BackGestureTfClassifierProvider();

    }

}

packages/SystemUI/src/com/android/systemui/statusbar/phone/EdgeBackGestureHandler.java

+19 −14
Original line number Diff line number Diff line
@@ -137,7 +137,9 @@ public class EdgeBackGestureHandler extends CurrentUserTracker implements Displa 
                            && (properties.getKeyset().contains(

                                    SystemUiDeviceConfigFlags.BACK_GESTURE_ML_MODEL_THRESHOLD)

                            || properties.getKeyset().contains(

                                    SystemUiDeviceConfigFlags.USE_BACK_GESTURE_ML_MODEL))) {

                                    SystemUiDeviceConfigFlags.USE_BACK_GESTURE_ML_MODEL)

                            || properties.getKeyset().contains(

                                    SystemUiDeviceConfigFlags.BACK_GESTURE_ML_MODEL_NAME))) {

                        updateMLModelState();

                    }

                }
@@ -478,8 +480,10 @@ public class EdgeBackGestureHandler extends CurrentUserTracker implements Displa 
        }



        if (newState) {

            String mlModelName = DeviceConfig.getString(DeviceConfig.NAMESPACE_SYSTEMUI,

                    SystemUiDeviceConfigFlags.BACK_GESTURE_ML_MODEL_NAME, "backgesture");

            mBackGestureTfClassifierProvider = SystemUIFactory.getInstance()

                    .createBackGestureTfClassifierProvider(mContext.getAssets());

                    .createBackGestureTfClassifierProvider(mContext.getAssets(), mlModelName);

            mMLModelThreshold = DeviceConfig.getFloat(DeviceConfig.NAMESPACE_SYSTEMUI,

                    SystemUiDeviceConfigFlags.BACK_GESTURE_ML_MODEL_THRESHOLD, 0.9f);

            if (mBackGestureTfClassifierProvider.isActive()) {
@@ -529,9 +533,6 @@ public class EdgeBackGestureHandler extends CurrentUserTracker implements Displa 
        boolean withinRange = false;

        float results = -1;



        if (mUseMLModel &&  (results = getBackGesturePredictionsCategory(x, y)) != -1) {

            withinRange = results == 1 ? true : false;

        } else {

        // Disallow if we are in the bottom gesture area

        if (y >= (mDisplaySize.y - mBottomGestureHeight)) {

            return false;
@@ -544,6 +545,10 @@ public class EdgeBackGestureHandler extends CurrentUserTracker implements Displa 
                && x < (mDisplaySize.x - 2 * (mEdgeWidthRight + mRightInset))) {

            return false;

        }



        if (mUseMLModel &&  (results = getBackGesturePredictionsCategory(x, y)) != -1) {

            withinRange = results == 1 ? true : false;

        } else {

            // Denotes whether we should proceed with the gesture.

            // Even if it is false, we may want to log it assuming

            // it is not invalid due to exclusion.