Merge "Merge 24Q3 to AOSP main" into main (3efb972a) · Commits · e / os / android_packages_apps_Settings

Android.bp

+5 −6

Original line number	Diff line number	Diff line
		@@ -84,6 +84,7 @@ android_library {
		"net-utils-framework-common",
		"notification_flags_lib",
		"securebox",
		"android.os.flags-aconfig-java",

		// Settings dependencies
		"FingerprintManagerInteractor",
		@@ -94,23 +95,21 @@ android_library {
		"SettingsLibActivityEmbedding",
		"aconfig_settings_flags_lib",
		"accessibility_settings_flags_lib",
		"app-usage-event-protos-lite",
		"battery-event-protos-lite",
		"battery-usage-slot-protos-lite",
		"contextualcards",
		"development_settings_flag_lib",
		"factory_reset_flags_lib",
		"fuelgauge-log-protos-lite",
		"fuelgauge-usage-state-protos-lite",
		"power-anomaly-event-protos-lite",
		"fuelgauge-protos-lite",
		"settings-contextual-card-protos-lite",
		"settings-log-bridge-protos-lite",
		"settings-logtags",
		"settings-telephony-protos-lite",
		"statslog-settings",
		"androidx.test.rules",
		"telephony_flags_core_java_lib",
		"setupdesign-lottie-loading-layout",
		"device_policy_aconfig_flags_lib",
		"kotlinx-coroutines-core",
		"kotlinx-coroutines-android",
		],

		plugins: ["androidx.room_room-compiler-plugin"],

+149 −50

File changed.

Preview size limit exceeded, changes collapsed.

+13 −16

Original line number	Diff line number	Diff line
		@@ -7,19 +7,16 @@
		"name": "SettingsUnitTests",
		"options": [
		{
		"include-filter": "com.android.settings.biometrics"
		"exclude-filter": "com.android.settings.fuelgauge.batterysaver"
		},
		{
		"include-filter": "com.android.settings.biometrics2"
		"exclude-filter": "com.android.settings.network.telephony"
		},
		{
		"include-filter": "com.android.settings.password"
		"exclude-filter": "com.android.settings.privatespace"
		},
		{
		"include-filter": "com.android.settings.safetycenter"
		},
		{
		"include-filter": "com.android.settings.security"
		"exclude-filter": "com.android.settings.regionalpreferences"
		}
		]
		}

+4 −4

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@ java_aconfig_library {
		aconfig_declarations {
		name: "factory_reset_flags",
		package: "com.android.settings.factory_reset",
		container: "system",
		container: "system_ext",
		srcs: ["factory_reset/*.aconfig"],
		}

		@@ -32,7 +32,7 @@ java_aconfig_library {
		aconfig_declarations {
		name: "media_drm_flags",
		package: "com.android.settings.media_drm",
		container: "system",
		container: "system_ext",
		srcs: ["media_drm/*.aconfig"],
		}

		@@ -44,7 +44,7 @@ java_aconfig_library {
		aconfig_declarations {
		name: "accessibility_flags",
		package: "com.android.settings.accessibility",
		container: "system",
		container: "system_ext",
		srcs: ["accessibility/*.aconfig"],
		}

		@@ -56,7 +56,7 @@ java_aconfig_library {
		aconfig_declarations {
		name: "development_settings_flags",
		package: "com.android.settings.development",
		container: "system",
		container: "system_ext",
		srcs: [
		"development/*/.aconfig",
		],

+18 −1

Original line number	Diff line number	Diff line
		package: "com.android.settings.accessibility"
		container: "system"
		container: "system_ext"

		# NOTE: Keep alphabetized to help limit merge conflicts from multiple simultaneous editors.

		flag {
		name: "add_brightness_settings_in_suw"
		namespace: "accessibility"
		description: "Whether to add brightness preference in SUW Vision Settings"
		bug: "332974327"
		}

		flag {
		name: "edit_shortcuts_in_full_screen"
		namespace: "accessibility"
		@@ -24,6 +31,16 @@ flag {
		bug: "301198830"
		}

		flag {
		name: "hide_magnification_always_on_toggle_when_window_mode_only"
		namespace: "accessibility"
		description: "Decides whether to hide the magnification always on setting when capabilities is window mode only."
		bug: "328787031"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "remove_qs_tooltip_in_suw"
		namespace: "accessibility"