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

Merge "Ensure that ML model results are still bounded by the gesture insets" into rvc-qpr-dev

Browse Source
This commit is contained in:
Winson Chung
2021-03-11 05:21:55 +00:00
committed by Android (Google) Code Review
parent 17d7e62c99 183e9b78ce
commit 64394decb9
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -560,20 +560,21 @@ public class EdgeBackGestureHandler extends CurrentUserTracker implements Displa
if (mVocab != null) { if (mVocab != null) {
app = mVocab.getOrDefault(mPackageName, -1); app = mVocab.getOrDefault(mPackageName, -1);
} }
// Check if we are within the tightest bounds beyond which
// we would not need to run the ML model. // Denotes whether we should proceed with the gesture. Even if it is false, we may want to
boolean withinRange = x <= mMLEnableWidth + mLeftInset // log it assuming it is not invalid due to exclusion.
|| x >= (mDisplaySize.x - mMLEnableWidth - mRightInset); boolean withinRange = x < mEdgeWidthLeft + mLeftInset
if (!withinRange) { || x >= (mDisplaySize.x - mEdgeWidthRight - mRightInset);
if (withinRange) {
int results = -1; int results = -1;
if (mUseMLModel && (results = getBackGesturePredictionsCategory(x, y, app)) != -1) {
withinRange = results == 1; // Check if we are within the tightest bounds beyond which we would not need to run the
} else { // ML model
// Denotes whether we should proceed with the gesture. boolean withinMinRange = x < mMLEnableWidth + mLeftInset
// Even if it is false, we may want to log it assuming || x >= (mDisplaySize.x - mMLEnableWidth - mRightInset);
// it is not invalid due to exclusion. if (!withinMinRange && mUseMLModel
withinRange = x <= mEdgeWidthLeft + mLeftInset && (results = getBackGesturePredictionsCategory(x, y, app)) != -1) {
|| x >= (mDisplaySize.x - mEdgeWidthRight - mRightInset); withinRange = (results == 1);
} }
} }