Merge "Add theme to the inline suggestion UI, which allows the host app (IME) to customize it" (d1e455a4) · Commits · e / os / android_frameworks_base

api/current.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -333,6 +333,9 @@ package android {
		field public static final int autoUrlDetect = 16843404; // 0x101028c
		field public static final int autoVerify = 16844014; // 0x10104ee
		field public static final int autofillHints = 16844118; // 0x1010556
		field public static final int autofillInlineSuggestionChip = 16844307; // 0x1010613
		field public static final int autofillInlineSuggestionSubtitle = 16844309; // 0x1010615
		field public static final int autofillInlineSuggestionTitle = 16844308; // 0x1010614
		field public static final int autofilledHighlight = 16844136; // 0x1010568
		field public static final int background = 16842964; // 0x10100d4
		field public static final int backgroundDimAmount = 16842802; // 0x1010032
		@@ -2253,6 +2256,7 @@ package android {
		field public static final int ThemeOverlay_Material_Dialog = 16974550; // 0x10302d6
		field public static final int ThemeOverlay_Material_Dialog_Alert = 16974551; // 0x10302d7
		field public static final int ThemeOverlay_Material_Light = 16974410; // 0x103024a
		field public static final int Theme_AutofillInlineSuggestion = 16974565; // 0x10302e5
		field public static final int Theme_Black = 16973832; // 0x1030008
		field public static final int Theme_Black_NoTitleBar = 16973833; // 0x1030009
		field public static final int Theme_Black_NoTitleBar_Fullscreen = 16973834; // 0x103000a

api/system-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -250,6 +250,7 @@ package android {

		public static final class R.attr {
		field public static final int allowClearUserDataOnFailedRestore = 16844288; // 0x1010600
		field public static final int isAutofillInlineSuggestionTheme = 16844310; // 0x1010616
		field public static final int isVrOnly = 16844152; // 0x1010578
		field public static final int minExtensionVersion = 16844306; // 0x1010612
		field public static final int requiredSystemPropertyName = 16844133; // 0x1010565

core/res/res/layout/autofill_inline_suggestion.xml

+19 −17

Original line number	Diff line number	Diff line
		@@ -16,19 +16,20 @@

		<LinearLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:tools="http://schemas.android.com/tools"
		style="?android:attr/autofillInlineSuggestionChip"
		android:layout_width="wrap_content"
		android:layout_height="56dp"
		android:background="@color/white"
		android:orientation="horizontal"
		android:paddingStart="12dp"
		android:paddingEnd="12dp">
		android:layout_height="wrap_content"
		android:gravity="center"
		android:paddingTop="4dp"
		android:paddingBottom="4dp"
		android:orientation="horizontal">

		<ImageView
		android:id="@+id/autofill_inline_suggestion_start_icon"
		android:layout_width="24dp"
		android:layout_height="24dp"
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		android:layout_gravity="center"
		android:scaleType="fitCenter"
		android:contentDescription="autofill_inline_suggestion_start_icon" />

		<LinearLayout
		@@ -36,32 +37,33 @@
		android:layout_height="match_parent"
		android:layout_gravity="center"
		android:layout_weight="1"
		android:layout_marginStart="12dp"
		android:layout_marginEnd="12dp"
		android:paddingStart="4dp"
		android:paddingEnd="4dp"
		android:orientation="vertical"
		android:gravity="center_vertical">
		android:gravity="center">

		<TextView
		style="?android:attr/autofillInlineSuggestionTitle"
		android:id="@+id/autofill_inline_suggestion_title"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:ellipsize="end"
		android:maxLines="1"
		tools:text="username1"/>
		android:maxLines="1"/>

		<TextView
		style="?android:attr/autofillInlineSuggestionSubtitle"
		android:id="@+id/autofill_inline_suggestion_subtitle"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:ellipsize="end"
		android:maxLines="1"
		tools:text="inline fill service"/>
		android:maxLines="1"/>
		</LinearLayout>

		<ImageView
		android:id="@+id/autofill_inline_suggestion_end_icon"
		android:layout_width="24dp"
		android:layout_height="24dp"
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		android:layout_gravity="center"
		android:scaleType="fitCenter"
		android:contentDescription="autofill_inline_suggestion_end_icon" />
		</LinearLayout>

core/res/res/values/attrs.xml

+8 −0

Original line number	Diff line number	Diff line
		@@ -9197,4 +9197,12 @@
		</declare-styleable>

		<attr name="autoSizePresetSizes" />

		<declare-styleable name="AutofillInlineSuggestion">
		<!-- @hide @SystemApi -->
		<attr name="isAutofillInlineSuggestionTheme" format="boolean" />
		<attr name="autofillInlineSuggestionChip" format="reference" />
		<attr name="autofillInlineSuggestionTitle" format="reference" />
		<attr name="autofillInlineSuggestionSubtitle" format="reference" />
		</declare-styleable>
		</resources>

core/res/res/values/public.xml

+6 −0

Original line number	Diff line number	Diff line
		@@ -3012,12 +3012,18 @@
		<public name="sdkVersion" />
		<!-- @hide @SystemApi -->
		<public name="minExtensionVersion" />
		<public name="autofillInlineSuggestionChip" />
		<public name="autofillInlineSuggestionTitle" />
		<public name="autofillInlineSuggestionSubtitle" />
		<!-- @hide @SystemApi -->
		<public name="isAutofillInlineSuggestionTheme" />
		</public-group>

		<public-group type="drawable" first-id="0x010800b5">
		</public-group>

		<public-group type="style" first-id="0x010302e5">
		<public name="Theme.AutofillInlineSuggestion" />
		</public-group>

		<public-group type="id" first-id="0x0102004a">