Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add log entries for the results for the ML model for

Browse Source 
the back gesture.

Test: manual
Bug: 150170384
Change-Id: Ic08bdea27fea085bcbb425dbac6682a88d29aa8a
Merged-In: Ic08bdea27fea085bcbb425dbac6682a88d29aa8a
This commit is contained in:
Maryam Karimzadehgan
2020-09-22 10:24:31 -07:00
committed by Winson Chung
parent c7035fe4fe
commit 832d060168
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmds/statsd/src/atoms.proto
View File

@@ -3038,6 +3038,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;

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

@@ -204,6 +204,7 @@ public class EdgeBackGestureHandler extends CurrentUserTracker implements Displa
private boolean mUseMLModel;
private float mMLModelThreshold;
private String mPackageName;
private float mMLResults;
private final GestureNavigationSettingsObserver mGestureNavigationSettingsObserver;
@@ -518,10 +519,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) {
@@ -598,7 +599,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) {
@@ -607,6 +609,7 @@ public class EdgeBackGestureHandler extends CurrentUserTracker implements Displa
// Verify if this is in within the touch region and we aren't in immersive mode, and
// either the bouncer is showing or the notification panel is hidden
mIsOnLeftEdge = ev.getX() <= mEdgeWidthLeft + mLeftInset;
mMLResults = 0;
mLogGesture = false;
mInRejectedExclusion = false;
mAllowGesture = !mDisabledForQuickstep && mIsBackGestureAllowed