Merge cherrypicks of [8828839, 8824129, 8828883, 8828885, 8828888, 8828891,... (7f91561b) · Commits · e / os / android_frameworks_base

core/java/android/view/View.java

+15 −0

Original line number	Diff line number	Diff line
		@@ -967,6 +967,19 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		*/
		static boolean sBrokenInsetsDispatch;

		/**
		* Prior to Q, calling
		* {@link com.android.internal.policy.DecorView#setBackgroundDrawable(Drawable)}
		* did not call update the window format so the opacity of the background was not correctly
		* applied to the window. Some applications rely on this misbehavior to work properly.
		* <p>
		* From Q, {@link com.android.internal.policy.DecorView#setBackgroundDrawable(Drawable)} is
		* the same as {@link com.android.internal.policy.DecorView#setWindowBackground(Drawable)}
		* which updates the window format.
		* @hide
		*/
		protected static boolean sBrokenWindowBackground;

		/** @hide */
		@IntDef({NOT_FOCUSABLE, FOCUSABLE, FOCUSABLE_AUTO})
		@Retention(RetentionPolicy.SOURCE)
		@@ -5104,6 +5117,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		sBrokenInsetsDispatch = ViewRootImpl.sNewInsetsMode != NEW_INSETS_MODE_FULL
		\|\| targetSdkVersion < Build.VERSION_CODES.Q;

		sBrokenWindowBackground = targetSdkVersion < Build.VERSION_CODES.Q;

		sCompatibilityDone = true;
		}
		}

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

+83 −0

Original line number	Diff line number	Diff line
		@@ -186,6 +186,89 @@ public final class SystemUiDeviceConfigFlags {
		*/
		public static final String BRIGHTLINE_FALSING_MANAGER_ENABLED =
		"brightline_falsing_manager_enabled";
		/**
		* (float) Maximum fraction of the screen required to qualify as a real swipe.
		*/
		public static final String BRIGHTLINE_FALSING_DISTANCE_SCREEN_FRACTION_MAX_DISTANCE =
		"brightline_falsing_distance_screen_fraction_max_distance";

		/**
		* (float) Multiplier for swipe velocity to convert it to pixels for a fling.
		*/
		public static final String BRIGHTLINE_FALSING_DISTANCE_VELOCITY_TO_DISTANCE =
		"brightline_falsing_distance_velcoity_to_distance";

		/**
		* (float) How far, in inches, must a fling travel horizontally to qualify as intentional.
		*/
		public static final String BRIGHTLINE_FALSING_DISTANCE_HORIZONTAL_FLING_THRESHOLD_IN =
		"brightline_falsing_distance_horizontal_fling_threshold_in";

		/**
		* (float) Maximum fraction of the screen required to qualify as a real swipe.
		*/
		public static final String BRIGHTLINE_FALSING_DISTANCE_VERTICAL_FLING_THRESHOLD_IN =
		"brightline_falsing_distance_vertical_fling_threshold_in";

		/**
		* (float) How far, in inches, must a continuous swipe travel horizontally to be intentional.
		*/
		public static final String BRIGHTLINE_FALSING_DISTANCE_HORIZONTAL_SWIPE_THRESHOLD_IN =
		"brightline_falsing_distance_horizontal_swipe_threshold_in";

		/**
		* (float) How far, in inches, must a continuous swipe travel vertically to be intentional.
		*/
		public static final String BRIGHTLINE_FALSING_DISTANCE_VERTICAL_SWIPE_THRESHOLD_IN =
		"brightline_falsing_distance_horizontal_swipe_threshold_in";

		/**
		* (float) Percentage of swipe with the proximity sensor covered that triggers a higher
		* swipe distance requirement.
		*/
		public static final String BRIGHTLINE_FALSING_PROXIMITY_PERCENT_COVERED_THRESHOLD =
		"brightline_falsing_proximity_percent_covered_threshold";

		/**
		* (float) Angle, in radians, that a swipe can vary from horizontal and sill be intentional.
		*/
		public static final String BRIGHTLINE_FALSING_DIAGONAL_HORIZONTAL_ANGLE_RANGE =
		"brightline_falsing_diagonal_horizontal_angle_range";

		/**
		* (float) Angle, in radians, that a swipe can vary from vertical and sill be intentional.
		*/
		public static final String BRIGHTLINE_FALSING_DIAGONAL_VERTICAL_ANGLE_RANGE =
		"brightline_falsing_diagonal_horizontal_angle_range";

		/**
		* (float) Distance, in inches, that a swipe is allowed to vary in the horizontal direction for
		* horizontal swipes.
		*/
		public static final String BRIGHTLINE_FALSING_ZIGZAG_X_PRIMARY_DEVIANCE =
		"brightline_falsing_zigzag_x_primary_deviance";

		/**
		* (float) Distance, in inches, that a swipe is allowed to vary in the vertical direction for
		* vertical swipes.
		*/
		public static final String BRIGHTLINE_FALSING_ZIGZAG_Y_PRIMARY_DEVIANCE =
		"brightline_falsing_zigzag_y_primary_deviance";

		/**
		* (float) Distance, in inches, that a swipe is allowed to vary in the horizontal direction for
		* horizontal swipes.
		*/
		public static final String BRIGHTLINE_FALSING_ZIGZAG_X_SECONDARY_DEVIANCE =
		"brightline_falsing_zigzag_x_secondary_deviance";

		/**
		* (float) Distance, in inches, that a swipe is allowed to vary in the vertical direction for
		* vertical swipes.
		*/
		public static final String BRIGHTLINE_FALSING_ZIGZAG_Y_SECONDARY_DEVIANCE =
		"brightline_falsing_zigzag_y_secondary_deviance";


		private SystemUiDeviceConfigFlags() { }
		}

core/java/com/android/internal/policy/DecorView.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -983,15 +983,16 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind

		@Override
		public void setBackgroundDrawable(Drawable background) {

		// TODO: This should route through setWindowBackground, but late in the release to make this
		// change.
		if (mOriginalBackgroundDrawable != background) {
		mOriginalBackgroundDrawable = background;
		updateBackgroundDrawable();
		if (!View.sBrokenWindowBackground) {
		drawableChanged();
		}
		}
		}

		public void setWindowFrame(Drawable drawable) {
		if (getForeground() != drawable) {

packages/SystemUI/src/com/android/systemui/classifier/brightline/BrightLineFalsingManager.java

+6 −4

Original line number	Diff line number	Diff line
		@@ -98,11 +98,13 @@ public class BrightLineFalsingManager implements FalsingManager {
		}

		private void sessionStart() {
		if (!mSessionStarted) {
		logDebug("Starting Session");
		mSessionStarted = true;
		registerSensors();
		mClassifiers.forEach(FalsingClassifier::onSessionStarted);
		}
		}

		private void sessionEnd() {
		if (mSessionStarted) {

packages/SystemUI/src/com/android/systemui/classifier/brightline/DiagonalClassifier.java

+20 −4

Original line number	Diff line number	Diff line
		@@ -16,9 +16,13 @@

		package com.android.systemui.classifier.brightline;

		import static com.android.internal.config.sysui.SystemUiDeviceConfigFlags.BRIGHTLINE_FALSING_DIAGONAL_HORIZONTAL_ANGLE_RANGE;
		import static com.android.internal.config.sysui.SystemUiDeviceConfigFlags.BRIGHTLINE_FALSING_DIAGONAL_VERTICAL_ANGLE_RANGE;
		import static com.android.systemui.classifier.Classifier.LEFT_AFFORDANCE;
		import static com.android.systemui.classifier.Classifier.RIGHT_AFFORDANCE;

		import android.provider.DeviceConfig;

		/**
		* False on swipes that are too close to 45 degrees.
		*
		@@ -35,8 +39,20 @@ class DiagonalClassifier extends FalsingClassifier {
		private static final float ONE_HUNDRED_EIGHTY_DEG = (float) (Math.PI);
		private static final float THREE_HUNDRED_SIXTY_DEG = (float) (2 * Math.PI);

		private final float mHorizontalAngleRange;
		private final float mVerticalAngleRange;

		DiagonalClassifier(FalsingDataProvider dataProvider) {
		super(dataProvider);

		mHorizontalAngleRange = DeviceConfig.getFloat(
		DeviceConfig.NAMESPACE_SYSTEMUI,
		BRIGHTLINE_FALSING_DIAGONAL_HORIZONTAL_ANGLE_RANGE,
		HORIZONTAL_ANGLE_RANGE);
		mVerticalAngleRange = DeviceConfig.getFloat(
		DeviceConfig.NAMESPACE_SYSTEMUI,
		BRIGHTLINE_FALSING_DIAGONAL_VERTICAL_ANGLE_RANGE,
		VERTICAL_ANGLE_RANGE);
		}

		@Override
		@@ -52,11 +68,11 @@ class DiagonalClassifier extends FalsingClassifier {
		return false;
		}

		float minAngle = DIAGONAL - HORIZONTAL_ANGLE_RANGE;
		float maxAngle = DIAGONAL + HORIZONTAL_ANGLE_RANGE;
		float minAngle = DIAGONAL - mHorizontalAngleRange;
		float maxAngle = DIAGONAL + mHorizontalAngleRange;
		if (isVertical()) {
		minAngle = DIAGONAL - VERTICAL_ANGLE_RANGE;
		maxAngle = DIAGONAL + VERTICAL_ANGLE_RANGE;
		minAngle = DIAGONAL - mVerticalAngleRange;
		maxAngle = DIAGONAL + mVerticalAngleRange;
		}

		return angleBetween(angle, minAngle, maxAngle)