Snap for 5803866 from e6d042dbb316c8686a56714fa13c6a0ed881db3d to qt-qpr1-release (6ad5af7e) · Commits · e / os / android_frameworks_base

core/java/android/app/Instrumentation.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -50,6 +50,7 @@ import android.view.InputDevice;
		import android.view.KeyCharacterMap;
		import android.view.KeyEvent;
		import android.view.MotionEvent;
		import android.view.SurfaceControl;
		import android.view.ViewConfiguration;
		import android.view.Window;
		import android.view.WindowManagerGlobal;
		@@ -528,6 +529,12 @@ public class Instrumentation {
		} while (mWaitingActivities.contains(aw));

		waitForEnterAnimationComplete(aw.activity);

		// Apply an empty transaction to ensure SF has a chance to update before
		// the Activity is ready (b/138263890).
		try (SurfaceControl.Transaction t = new SurfaceControl.Transaction()) {
		t.apply(true);
		}
		return aw.activity;
		}
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -339,6 +339,8 @@ public final class Sensor {
		* for {@link #TYPE_STEP_COUNTER} instead. It is defined as a
		* {@link Sensor#REPORTING_MODE_SPECIAL_TRIGGER} sensor.
		* <p>
		* This sensor requires permission {@code android.permission.ACTIVITY_RECOGNITION}.
		* <p>
		* See {@link android.hardware.SensorEvent#values SensorEvent.values} for more details.
		*/
		public static final int TYPE_STEP_DETECTOR = 18;
		@@ -384,8 +386,6 @@ public final class Sensor {
		* gyroscope. This sensor uses lower power than the other rotation vectors, because it doesn't
		* use the gyroscope. However, it is more noisy and will work best outdoors.
		* <p>
		* This sensor requires permission {@code android.permission.ACTIVITY_RECOGNITION}.
		* <p>
		* See {@link android.hardware.SensorEvent#values SensorEvent.values} for more details.
		*/
		public static final int TYPE_GEOMAGNETIC_ROTATION_VECTOR = 20;

+2 −3

Original line number	Diff line number	Diff line
		@@ -188,9 +188,8 @@ public class QuickStepContract {
		if ((sysuiStateFlags & SYSUI_STATE_BOUNCER_SHOWING) != 0) {
		return false;
		}
		// Disable when in screen pinning, immersive, or the notifications are interactive
		int disableFlags = SYSUI_STATE_SCREEN_PINNING
		\| SYSUI_STATE_NAV_BAR_HIDDEN
		// Disable when in immersive, or the notifications are interactive
		int disableFlags = SYSUI_STATE_NAV_BAR_HIDDEN
		\| SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED
		\| SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING;
		return (sysuiStateFlags & disableFlags) != 0;

+3 −1

Original line number	Diff line number	Diff line
		@@ -100,7 +100,9 @@ public class InvocationLightsView extends View

		int cornerRadiusBottom = DisplayUtils.getCornerRadiusBottom(context);
		int cornerRadiusTop = DisplayUtils.getCornerRadiusTop(context);
		mViewHeight = Math.max(cornerRadiusBottom, cornerRadiusTop);
		// ensure that height is non-zero even for square corners
		mViewHeight = Math.max(Math.max(cornerRadiusBottom, cornerRadiusTop),
		DisplayUtils.convertDpToPx(LIGHT_HEIGHT_DP, context));

		final int dualToneDarkTheme = Utils.getThemeAttr(mContext, R.attr.darkIconTheme);
		final int dualToneLightTheme = Utils.getThemeAttr(mContext, R.attr.lightIconTheme);

+1 −1

Original line number	Diff line number	Diff line
		@@ -25,7 +25,7 @@ import com.android.keyguard.KeyguardUpdateMonitor;
		*/
		public class DozeAuthRemover implements DozeMachine.Part {

		KeyguardUpdateMonitor mKeyguardUpdateMonitor;
		private final KeyguardUpdateMonitor mKeyguardUpdateMonitor;

		public DozeAuthRemover(Context context) {
		mKeyguardUpdateMonitor = KeyguardUpdateMonitor.getInstance(context);