Merge "AF: Add a passwordsActivity attribute." into sc-dev (ed0d866a) · Commits · e / os / android_frameworks_base

core/api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -1072,6 +1072,7 @@ package android {
		field public static final int panelTextAppearance = 16842850; // 0x1010062
		field public static final int parentActivityName = 16843687; // 0x10103a7
		field @Deprecated public static final int password = 16843100; // 0x101015c
		field public static final int passwordsActivity = 16844351; // 0x101063f
		field public static final int path = 16842794; // 0x101002a
		field public static final int pathAdvancedPattern = 16844320; // 0x1010620
		field public static final int pathData = 16843781; // 0x1010405

core/java/android/service/autofill/AutofillServiceInfo.java

+16 −0

Original line number	Diff line number	Diff line
		@@ -81,6 +81,8 @@ public final class AutofillServiceInfo {

		@Nullable
		private final String mSettingsActivity;
		@Nullable
		private final String mPasswordsActivity;

		@Nullable
		private final ArrayMap<String, Long> mCompatibilityPackages;
		@@ -118,12 +120,14 @@ public final class AutofillServiceInfo {
		AutofillService.SERVICE_META_DATA);
		if (parser == null) {
		mSettingsActivity = null;
		mPasswordsActivity = null;
		mCompatibilityPackages = null;
		mInlineSuggestionsEnabled = false;
		return;
		}

		String settingsActivity = null;
		String passwordsActivity = null;
		ArrayMap<String, Long> compatibilityPackages = null;
		boolean inlineSuggestionsEnabled = false; // false by default.

		@@ -144,6 +148,8 @@ public final class AutofillServiceInfo {
		com.android.internal.R.styleable.AutofillService);
		settingsActivity = afsAttributes.getString(
		R.styleable.AutofillService_settingsActivity);
		passwordsActivity = afsAttributes.getString(
		R.styleable.AutofillService_passwordsActivity);
		inlineSuggestionsEnabled = afsAttributes.getBoolean(
		R.styleable.AutofillService_supportsInlineSuggestions, false);
		} finally {
		@@ -160,6 +166,7 @@ public final class AutofillServiceInfo {
		}

		mSettingsActivity = settingsActivity;
		mPasswordsActivity = passwordsActivity;
		mCompatibilityPackages = compatibilityPackages;
		mInlineSuggestionsEnabled = inlineSuggestionsEnabled;
		}
		@@ -226,6 +233,7 @@ public final class AutofillServiceInfo {
		return compatibilityPackages;
		}

		@NonNull
		public ServiceInfo getServiceInfo() {
		return mServiceInfo;
		}
		@@ -235,6 +243,12 @@ public final class AutofillServiceInfo {
		return mSettingsActivity;
		}

		@Nullable
		public String getPasswordsActivity() {
		return mPasswordsActivity;
		}

		@Nullable
		public ArrayMap<String, Long> getCompatibilityPackages() {
		return mCompatibilityPackages;
		}
		@@ -273,6 +287,7 @@ public final class AutofillServiceInfo {
		builder.append(getClass().getSimpleName());
		builder.append("[").append(mServiceInfo);
		builder.append(", settings:").append(mSettingsActivity);
		builder.append(", passwords activity:").append(mPasswordsActivity);
		builder.append(", hasCompatPckgs:").append(mCompatibilityPackages != null
		&& !mCompatibilityPackages.isEmpty()).append("]");
		builder.append(", inline suggestions enabled:").append(mInlineSuggestionsEnabled);
		@@ -285,6 +300,7 @@ public final class AutofillServiceInfo {
		public void dump(String prefix, PrintWriter pw) {
		pw.print(prefix); pw.print("Component: "); pw.println(getServiceInfo().getComponentName());
		pw.print(prefix); pw.print("Settings: "); pw.println(mSettingsActivity);
		pw.print(prefix); pw.print("Passwords activity: "); pw.println(mPasswordsActivity);
		pw.print(prefix); pw.print("Compat packages: "); pw.println(mCompatibilityPackages);
		pw.print(prefix); pw.print("Inline Suggestions Enabled: ");
		pw.println(mInlineSuggestionsEnabled);

core/res/res/values/attrs.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -8424,6 +8424,9 @@
		<!-- Fully qualified class name of an activity that allows the user to modify
		the settings for this service. -->
		<attr name="settingsActivity" />
		<!-- Fully qualified class name of an activity that allows the user to view any passwords
		saved by this service. -->
		<attr name="passwordsActivity" format="string" />

		<!-- Specifies whether the AutofillService supports inline suggestions-->
		<attr name="supportsInlineSuggestions" format="boolean" />

core/res/res/values/public.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -3085,6 +3085,7 @@
		<public name="hand_secondTint"/>
		<public name="hand_secondTintMode"/>
		<public name="dataExtractionRules"/>
		<public name="passwordsActivity"/>
		</public-group>

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