Snap for 10755079 from 15e796566517958edb08fec56bcbf3f304cac717 to udc-qpr1-release (674e43e5) · Commits · e / os / android_frameworks_base

core/java/android/content/AttributionSource.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -544,8 +544,6 @@ public final class AttributionSource implements Parcelable {
		o.mAttributionSourceState.packageName)
		&& Objects.equals(mAttributionSourceState.attributionTag,
		o.mAttributionSourceState.attributionTag)
		&& Objects.equals(mAttributionSourceState.token,
		o.mAttributionSourceState.token)
		&& Arrays.equals(mAttributionSourceState.renouncedPermissions,
		o.mAttributionSourceState.renouncedPermissions)
		&& Objects.equals(getNext(), o.getNext());

core/res/res/layout/autofill_fill_dialog.xml

+10 −7

Original line number	Diff line number	Diff line
		@@ -85,14 +85,18 @@
		android:layout_marginStart="24dp"
		android:layout_marginEnd="24dp"
		android:theme="@style/Theme.DeviceDefault.AutofillHalfScreenDialogButton"
		android:orientation="horizontal">
		android:orientation="horizontal"
		android:gravity="center_vertical">

		<Button
		android:id="@+id/autofill_dialog_no"
		android:layout_width="wrap_content"
		android:layout_height="36dp"
		android:layout_marginTop="6dp"
		android:layout_marginBottom="6dp"
		android:layout_height="40dp"
		android:paddingStart="12dp"
		android:paddingEnd="12dp"
		android:paddingTop="0dp"
		android:paddingBottom="0dp"
		android:minWidth="0dp"
		style="?android:attr/borderlessButtonStyle"
		android:text="@string/autofill_save_no">
		</Button>
		@@ -107,9 +111,8 @@
		<Button
		android:id="@+id/autofill_dialog_yes"
		android:layout_width="wrap_content"
		android:layout_height="36dp"
		android:layout_marginTop="6dp"
		android:layout_marginBottom="6dp"
		android:layout_height="40dp"
		android:minWidth="0dp"
		style="@style/AutofillHalfSheetTonalButton"
		android:text="@string/autofill_save_yes"
		android:visibility="gone" >

core/res/res/layout/autofill_save.xml

+10 −7

Original line number	Diff line number	Diff line
		@@ -72,14 +72,18 @@
		android:layout_marginTop="32dp"
		android:layout_marginBottom="18dp"
		android:theme="@style/Theme.DeviceDefault.AutofillHalfScreenDialogButton"
		android:orientation="horizontal">
		android:orientation="horizontal"
		android:gravity="center_vertical">

		<Button
		android:id="@+id/autofill_save_no"
		android:layout_width="wrap_content"
		android:layout_height="36dp"
		android:layout_marginTop="6dp"
		android:layout_marginBottom="6dp"
		android:layout_height="40dp"
		android:paddingStart="12dp"
		android:paddingEnd="12dp"
		android:paddingTop="0dp"
		android:paddingBottom="0dp"
		android:minWidth="0dp"
		style="?android:attr/borderlessButtonStyle"
		android:text="@string/autofill_save_no">
		</Button>
		@@ -94,9 +98,8 @@
		<Button
		android:id="@+id/autofill_save_yes"
		android:layout_width="wrap_content"
		android:layout_height="36dp"
		android:layout_marginTop="6dp"
		android:layout_marginBottom="6dp"
		android:layout_height="40dp"
		android:minWidth="0dp"
		style="@style/AutofillHalfSheetTonalButton"
		android:text="@string/autofill_save_yes">
		</Button>

core/res/res/values/styles.xml

+2 −6

Original line number	Diff line number	Diff line
		@@ -1500,12 +1500,8 @@ please see styles_device_defaults.xml.
		<item name="fontFamily">google-sans-text-medium</item>
		<item name="textStyle">normal</item>
		<item name="textAllCaps">false</item>
		<item name="layout_marginTop">6dp</item>
		<item name="layout_marginBottom">6dp</item>
		<item name="paddingStart">16dp</item>
		<item name="paddingEnd">16dp</item>
		<item name="paddingTop">8dp</item>
		<item name="paddingBottom">8dp</item>
		<item name="paddingStart">24dp</item>
		<item name="paddingEnd">24dp</item>
		</style>
		<!-- @hide Tonal button for Autofill half screen dialog -->
		<style name="AutofillHalfSheetTonalButton" parent="AutofillHalfSheetButton">

libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitPresenter.java

+15 −2

Original line number	Diff line number	Diff line
		@@ -651,7 +651,8 @@ class SplitPresenter extends JetpackTaskFragmentOrganizer {
		if (minDimensionsPair == null) {
		return splitAttributes;
		}
		final FoldingFeature foldingFeature = getFoldingFeature(taskProperties);
		final FoldingFeature foldingFeature = getFoldingFeatureForHingeType(
		taskProperties, splitAttributes);
		final Configuration taskConfiguration = taskProperties.getConfiguration();
		final Rect primaryBounds = getPrimaryBounds(taskConfiguration, splitAttributes,
		foldingFeature);
		@@ -726,7 +727,8 @@ class SplitPresenter extends JetpackTaskFragmentOrganizer {
		Rect getRelBoundsForPosition(@Position int position, @NonNull TaskProperties taskProperties,
		@NonNull SplitAttributes splitAttributes) {
		final Configuration taskConfiguration = taskProperties.getConfiguration();
		final FoldingFeature foldingFeature = getFoldingFeature(taskProperties);
		final FoldingFeature foldingFeature = getFoldingFeatureForHingeType(
		taskProperties, splitAttributes);
		if (!shouldShowSplit(splitAttributes)) {
		return new Rect();
		}
		@@ -932,6 +934,17 @@ class SplitPresenter extends JetpackTaskFragmentOrganizer {
		}
		}

		@Nullable
		private FoldingFeature getFoldingFeatureForHingeType(
		@NonNull TaskProperties taskProperties,
		@NonNull SplitAttributes splitAttributes) {
		SplitType splitType = splitAttributes.getSplitType();
		if (!(splitType instanceof HingeSplitType)) {
		return null;
		}
		return getFoldingFeature(taskProperties);
		}

		@Nullable
		@VisibleForTesting
		FoldingFeature getFoldingFeature(@NonNull TaskProperties taskProperties) {