Snap for 5743241 from 1ebcfb66c9e0a47c8190602b93cea318c04eb77e to qt-c2f2-release (cad19883) · Commits · e / os / android_frameworks_base

core/java/android/app/Notification.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -8101,8 +8101,7 @@ public class Notification implements Parcelable
		*/
		@Override
		public RemoteViews makeHeadsUpContentView(boolean increasedHeight) {
		RemoteViews expanded = makeMediaBigContentView();
		return expanded != null ? expanded : makeMediaContentView();
		return makeMediaContentView();
		}

		/** @hide */

core/java/android/hardware/biometrics/IBiometricEnabledOnKeyguardCallback.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -22,5 +22,5 @@ import android.hardware.biometrics.BiometricSourceType;
		* @hide
		*/
		oneway interface IBiometricEnabledOnKeyguardCallback {
		void onChanged(in BiometricSourceType type, boolean enabled);
		void onChanged(in BiometricSourceType type, boolean enabled, int userId);
		}
		No newline at end of file

core/java/android/widget/ArrayAdapter.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -50,7 +50,7 @@ import java.util.List;
		* override {@link #getView(int, View, ViewGroup)}
		* and inflate a view resource.
		* For a code example, see
		* the <a href="https://developer.android.com/samples/CustomChoiceList/index.html">
		* the <a href="https://github.com/googlesamples/android-CustomChoiceList/#readme">
		* CustomChoiceList</a> sample.
		* </p>
		* <p>

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

+83 −0

Original line number	Diff line number	Diff line
		@@ -191,6 +191,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/res/res/layout/notification_template_material_media.xml

+4 −4

Original line number	Diff line number	Diff line
		@@ -15,7 +15,7 @@
		~ limitations under the License
		-->

		<FrameLayout
		<com.android.internal.widget.MediaNotificationView
		android:id="@+id/status_bar_latest_event_content"
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		@@ -24,8 +24,8 @@
		android:tag="media"
		>
		<ImageView android:id="@+id/right_icon"
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		android:layout_width="0dp"
		android:layout_height="0dp"
		android:adjustViewBounds="true"
		android:layout_gravity="top\|end"
		android:scaleType="centerCrop"
		@@ -91,4 +91,4 @@
		android:layout_alignParentBottom="true"
		/>
		</LinearLayout>
		</FrameLayout>
		</com.android.internal.widget.MediaNotificationView>