Merge "Created new Settings preferences for internal autofill state." (2dbf5765) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+27 −0

Original line number	Diff line number	Diff line
		@@ -12066,6 +12066,33 @@ public final class Settings {
		public static final String AUTOFILL_COMPAT_MODE_ALLOWED_PACKAGES =
		"autofill_compat_mode_allowed_packages";

		/**
		* Level of autofill logging.
		*
		* <p>Valid values are
		* {@link android.view.autofill.AutofillManager#NO_LOGGING},
		* {@link android.view.autofill.AutofillManager#FLAG_ADD_CLIENT_DEBUG}, or
		* {@link android.view.autofill.AutofillManager#FLAG_ADD_CLIENT_VERBOSE}.
		*
		* @hide
		*/
		public static final String AUTOFILL_LOGGING_LEVEL = "autofill_logging_level";

		/**
		* Maximum number of partitions that can be allowed in an autofill session.
		*
		* @hide
		*/
		public static final String AUTOFILL_MAX_PARTITIONS_SIZE = "autofill_max_partitions_size";

		/**
		* Maximum number of visible datasets in the Autofill dataset picker UI, or {@code 0} to use
		* the default value from resources.
		*
		* @hide
		*/
		public static final String AUTOFILL_MAX_VISIBLE_DATASETS = "autofill_max_visible_datasets";

		/**
		* Exemptions to the hidden API blacklist.
		*

+9 −1

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@ import android.content.pm.PackageManager;
		import android.content.pm.ResolveInfo;
		import android.graphics.Rect;
		import android.metrics.LogMaker;
		import android.os.Build;
		import android.os.Bundle;
		import android.os.IBinder;
		import android.os.Parcelable;
		@@ -202,10 +203,17 @@ public final class AutofillManager {
		/** @hide */ public static final int ACTION_VIEW_EXITED = 3;
		/** @hide */ public static final int ACTION_VALUE_CHANGED = 4;


		/** @hide */ public static final int NO_LOGGING = 0;
		/** @hide */ public static final int FLAG_ADD_CLIENT_ENABLED = 0x1;
		/** @hide */ public static final int FLAG_ADD_CLIENT_DEBUG = 0x2;
		/** @hide */ public static final int FLAG_ADD_CLIENT_VERBOSE = 0x4;
		/** @hide */
		public static final int DEFAULT_LOGGING_LEVEL = Build.IS_DEBUGGABLE
		? AutofillManager.FLAG_ADD_CLIENT_DEBUG
		: AutofillManager.NO_LOGGING;

		/** @hide */
		public static final int DEFAULT_MAX_PARTITIONS_SIZE = 10;

		/** Which bits in an authentication id are used for the dataset id */
		private static final int AUTHENTICATION_ID_DATASET_ID_MASK = 0xFFFF;

+13 −2

Original line number	Diff line number	Diff line
		@@ -97,7 +97,18 @@ message GlobalSettingsProto {
		}
		optional Auto auto = 16;

		optional SettingProto autofill_compat_mode_allowed_packages = 17 [ (android.privacy).dest = DEST_AUTOMATIC ];
		reserved 17; // Used to be autofill_compat_mode_allowed_packages

		message Autofill {
		option (android.msg_privacy).dest = DEST_EXPLICIT;

		optional SettingProto compat_mode_allowed_packages = 1 [ (android.privacy).dest = DEST_AUTOMATIC ];
		optional SettingProto logging_level = 2 [ (android.privacy).dest = DEST_AUTOMATIC ];
		optional SettingProto max_partitions_size = 3 [ (android.privacy).dest = DEST_AUTOMATIC ];
		optional SettingProto max_visible_datasets = 4 [ (android.privacy).dest = DEST_AUTOMATIC ];
		}
		optional Autofill autofill = 140;

		optional SettingProto backup_agent_timeout_parameters = 18;

		message Battery {
		@@ -943,5 +954,5 @@ message GlobalSettingsProto {

		// Please insert fields in alphabetical order and group them into messages
		// if possible (to avoid reaching the method limit).
		// Next tag = 140;
		// Next tag = 141;
		}

+3 −0

Original line number	Diff line number	Diff line
		@@ -119,6 +119,9 @@ public class SettingsBackupTest {
		Settings.Global.ASSISTED_GPS_ENABLED,
		Settings.Global.AUDIO_SAFE_VOLUME_STATE,
		Settings.Global.AUTOFILL_COMPAT_MODE_ALLOWED_PACKAGES,
		Settings.Global.AUTOFILL_LOGGING_LEVEL,
		Settings.Global.AUTOFILL_MAX_PARTITIONS_SIZE,
		Settings.Global.AUTOFILL_MAX_VISIBLE_DATASETS,
		Settings.Global.BATTERY_DISCHARGE_DURATION_THRESHOLD,
		Settings.Global.BATTERY_DISCHARGE_THRESHOLD,
		Settings.Global.BATTERY_SAVER_DEVICE_SPECIFIC_CONSTANTS,

+2 −1

Original line number	Diff line number	Diff line
		@@ -1120,4 +1120,5 @@

		<!-- time label for event have that happened very recently [CHAR LIMIT=60] -->
		<string name="time_unit_just_now">Just now</string>

		</resources>