Snap for 8055317 from ef968723a55b7e1d2d96f8012d2d16af744f7f9b to sc-v2-release (42577971) · Commits · e / os / android_frameworks_base

core/java/android/view/BatchedInputEventReceiver.java

+15 −1

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package android.view;

		import android.compat.annotation.UnsupportedAppUsage;
		import android.os.Handler;
		import android.os.Looper;

		/**
		@@ -27,6 +28,13 @@ public class BatchedInputEventReceiver extends InputEventReceiver {
		private Choreographer mChoreographer;
		private boolean mBatchingEnabled;
		private boolean mBatchedInputScheduled;
		private final Handler mHandler;
		private final Runnable mConsumeBatchedInputEvents = new Runnable() {
		@Override
		public void run() {
		consumeBatchedInputEvents(-1);
		}
		};

		@UnsupportedAppUsage
		public BatchedInputEventReceiver(
		@@ -34,6 +42,7 @@ public class BatchedInputEventReceiver extends InputEventReceiver {
		super(inputChannel, looper);
		mChoreographer = choreographer;
		mBatchingEnabled = true;
		mHandler = new Handler(looper);
		}

		@Override
		@@ -57,10 +66,15 @@ public class BatchedInputEventReceiver extends InputEventReceiver {
		* @hide
		*/
		public void setBatchingEnabled(boolean batchingEnabled) {
		if (mBatchingEnabled == batchingEnabled) {
		return;
		}

		mBatchingEnabled = batchingEnabled;
		mHandler.removeCallbacks(mConsumeBatchedInputEvents);
		if (!batchingEnabled) {
		unscheduleBatchedInput();
		consumeBatchedInputEvents(-1);
		mHandler.post(mConsumeBatchedInputEvents);
		}
		}

+3 −1

Original line number	Diff line number	Diff line
		@@ -205,8 +205,10 @@ oneway interface IStatusBar
		*
		* @param displayId the ID of the display to notify.
		* @param types the internal insets types of the bars are about to show transiently.
		* @param isGestureOnSystemBar whether the gesture to show the transient bar was a gesture on
		* one of the bars itself.
		*/
		void showTransient(int displayId, in int[] types);
		void showTransient(int displayId, in int[] types, boolean isGestureOnSystemBar);

		/**
		* Notifies System UI to abort the transient state of system bars, which prevents the bars being

+1 −1

Original line number	Diff line number	Diff line
		@@ -21,7 +21,7 @@
		android:orientation="vertical"
		android:clipToPadding="false"
		android:paddingEnd="@dimen/compat_hint_padding_end"
		android:paddingBottom="5dp"
		android:paddingBottom="8dp"
		android:clickable="true">

		<TextView

+6 −4

Original line number	Diff line number	Diff line
		@@ -33,8 +33,8 @@
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:clipToPadding="false"
		android:layout_marginEnd="16dp"
		android:layout_marginBottom="16dp"
		android:layout_marginEnd="@dimen/compat_button_margin"
		android:layout_marginBottom="@dimen/compat_button_margin"
		android:orientation="vertical">

		<ImageButton
		@@ -62,8 +62,10 @@
		<ImageButton
		android:id="@+id/size_compat_restart_button"
		android:visibility="gone"
		android:layout_width="@dimen/size_compat_button_width"
		android:layout_height="@dimen/size_compat_button_height"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginEnd="@dimen/compat_button_margin"
		android:layout_marginBottom="@dimen/compat_button_margin"
		android:src="@drawable/size_compat_restart_button_ripple"
		android:background="@android:color/transparent"
		android:contentDescription="@string/restart_button_description"/>

+4 −7

Original line number	Diff line number	Diff line
		@@ -200,11 +200,8 @@
		<!-- Size of user education views on large screens (phone is just match parent). -->
		<dimen name="bubbles_user_education_width_large_screen">400dp</dimen>

		<!-- The width of the size compat restart button including padding. -->
		<dimen name="size_compat_button_width">80dp</dimen>

		<!-- The height of the size compat restart button including padding. -->
		<dimen name="size_compat_button_height">64dp</dimen>
		<!-- Bottom and end margin for compat buttons. -->
		<dimen name="compat_button_margin">16dp</dimen>

		<!-- The radius of the corners of the compat hint bubble. -->
		<dimen name="compat_hint_corner_radius">28dp</dimen>
		@@ -212,8 +209,8 @@
		<!-- The width of the compat hint point. -->
		<dimen name="compat_hint_point_width">10dp</dimen>

		<!-- The end padding for the compat hint. Computed as (size_compat_button_width / 2
		- compat_hint_corner_radius - compat_hint_point_width /2). -->
		<!-- The end padding for the compat hint. Computed as (compat button width (=48) / 2
		+ compat_button_margin - compat_hint_corner_radius - compat_hint_point_width / 2). -->
		<dimen name="compat_hint_padding_end">7dp</dimen>

		<!-- The width of the size compat hint. -->