Merge "Ensure that ML model results are still bounded by the gesture insets" into sc-dev (a69d3dc3) · Commits · e / os / android_frameworks_base

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

+15 −14

Original line number	Diff line number	Diff line
		@@ -609,20 +609,21 @@ public class EdgeBackGestureHandler extends CurrentUserTracker implements Displa
		if (mVocab != null) {
		app = mVocab.getOrDefault(mPackageName, -1);
		}
		// Check if we are within the tightest bounds beyond which
		// we would not need to run the ML model.
		boolean withinRange = x < mMLEnableWidth + mLeftInset
		\|\| x >= (mDisplaySize.x - mMLEnableWidth - mRightInset);
		if (!withinRange) {
		int results = -1;
		if (mUseMLModel && (results = getBackGesturePredictionsCategory(x, y, app)) != -1) {
		withinRange = results == 1;
		} 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.
		withinRange = x < mEdgeWidthLeft + mLeftInset

		// 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.
		boolean withinRange = x < mEdgeWidthLeft + mLeftInset
		\|\| x >= (mDisplaySize.x - mEdgeWidthRight - mRightInset);
		if (withinRange) {
		int results = -1;

		// Check if we are within the tightest bounds beyond which we would not need to run the
		// ML model
		boolean withinMinRange = x < mMLEnableWidth + mLeftInset
		\|\| x >= (mDisplaySize.x - mMLEnableWidth - mRightInset);
		if (!withinMinRange && mUseMLModel
		&& (results = getBackGesturePredictionsCategory(x, y, app)) != -1) {
		withinRange = (results == 1);
		}
		}