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

Commit f3d28593 authored by Maryam Karimzadehgan's avatar Maryam Karimzadehgan
Browse files

Add log entries for the results for the ML model for 

the back gesture.

Test: manual
Bug: 150170384
Change-Id: Ic08bdea27fea085bcbb425dbac6682a88d29aa8a
parent 46c6d727

cmds/statsd/src/atoms.proto

+2 −0
Original line number Diff line number Diff line
@@ -3192,6 +3192,8 @@ message BackGesture { 
    optional int32 end_y = 7;  // Y coordinate for ACTION_MOVE event.

    optional int32 left_boundary = 8;  // left edge width + left inset

    optional int32 right_boundary = 9;  // screen width - (right edge width + right inset)

    optional float ml_model_score = 10;  // The score between 0 and 1 which is the prediction output

        // for the Back Gesture model.



    enum WindowHorizontalLocation {

        DEFAULT_LOCATION = 0;

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

+7 −4
Original line number Diff line number Diff line
@@ -207,6 +207,7 @@ public class EdgeBackGestureHandler extends CurrentUserTracker implements Displa 
    private boolean mUseMLModel;

    private float mMLModelThreshold;

    private String mPackageName;

    private float mMLResults;



    private final GestureNavigationSettingsObserver mGestureNavigationSettingsObserver;
@@ -531,10 +532,10 @@ public class EdgeBackGestureHandler extends CurrentUserTracker implements Displa 
            new long[]{(long) y},

        };



        final float results = mBackGestureTfClassifierProvider.predict(featuresVector);

        if (results == -1) return -1;

        mMLResults = mBackGestureTfClassifierProvider.predict(featuresVector);

        if (mMLResults == -1) return -1;



        return results >= mMLModelThreshold ? 1 : 0;

        return mMLResults >= mMLModelThreshold ? 1 : 0;

    }



    private boolean isWithinTouchRegion(int x, int y) {
@@ -611,7 +612,8 @@ public class EdgeBackGestureHandler extends CurrentUserTracker implements Displa 
                (int) mDownPoint.x, (int) mDownPoint.y,

                (int) mEndPoint.x, (int) mEndPoint.y,

                mEdgeWidthLeft + mLeftInset,

                mDisplaySize.x - (mEdgeWidthRight + mRightInset));

                mDisplaySize.x - (mEdgeWidthRight + mRightInset),

                mUseMLModel ? mMLResults : -2);

    }



    private void onMotionEvent(MotionEvent ev) {
@@ -621,6 +623,7 @@ public class EdgeBackGestureHandler extends CurrentUserTracker implements Displa 
            // either the bouncer is showing or the notification panel is hidden

            mInputEventReceiver.setBatchingEnabled(false);

            mIsOnLeftEdge = ev.getX() <= mEdgeWidthLeft + mLeftInset;

            mMLResults = 0;

            mLogGesture = false;

            mInRejectedExclusion = false;

            mAllowGesture = !mDisabledForQuickstep && mIsBackGestureAllowed