Merge "Merge Android 14" into main (dc85f402) · Commits · e / os / android_packages_apps_Settings

Android.bp

+20 −3

Original line number	Diff line number	Diff line
		@@ -51,10 +51,15 @@ android_library {
		defaults: [
		"SettingsLibDefaults",
		"SettingsLib-search-defaults",
		"SpaPrivilegedLib-defaults",
		],

		srcs: ["src/*/.java", "src/*/.kt"],

		resource_dirs: [
		"res",
		"res-export", // for external usage
		"res-product",
		],
		static_libs: [
		"androidx-constraintlayout_constraintlayout",
		"androidx.slice_slice-builders",
		@@ -63,6 +68,7 @@ android_library {
		"androidx.core_core",
		"androidx.appcompat_appcompat",
		"androidx.cardview_cardview",
		"androidx.compose.runtime_runtime-livedata",
		"androidx.preference_preference",
		"androidx.recyclerview_recyclerview",
		"androidx.window_window",
		@@ -70,14 +76,19 @@ android_library {
		"setupcompat",
		"setupdesign",
		"androidx.lifecycle_lifecycle-runtime",
		"androidx.lifecycle_lifecycle-extensions",
		"androidx.lifecycle_lifecycle-viewmodel",
		"guava",
		"jsr305",
		"net-utils-framework-common",
		"app-usage-event-protos-lite",
		"battery-event-protos-lite",
		"settings-contextual-card-protos-lite",
		"settings-log-bridge-protos-lite",
		"settings-telephony-protos-lite",
		"fuelgauge-log-protos-lite",
		"fuelgauge-usage-state-protos-lite",
		"contextualcards",
		"securebox",
		"settings-logtags",
		"statslog-settings",
		"zxing-core-1.7",
		@@ -88,9 +99,12 @@ android_library {
		"WifiTrackerLib",
		"SettingsLibActivityEmbedding",
		"Settings-change-ids",
		"androidx.room_room-runtime",
		"SystemUIUnfoldLib",
		],

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

		libs: [
		"telephony-common",
		"ims-common",
		@@ -105,7 +119,10 @@ platform_compat_config {

		android_app {
		name: "Settings",
		defaults: ["platform_app_defaults"],
		defaults: [
		"platform_app_defaults",
		"SpaPrivilegedLib-defaults",
		],
		platform_apis: true,
		certificate: "platform",
		system_ext_specific: true,

AndroidManifest.xml

+433 −75

File changed.

Preview size limit exceeded, changes collapsed.

TEST_MAPPING

+19 −0

Original line number	Diff line number	Diff line
		{
		"presubmit": [
		{
		"name": "SettingsSpaUnitTests"
		},
		{
		"name": "SettingsUnitTests",
		"options": [
		{
		"include-filter": "com.android.settings.password"
		},
		{
		"include-filter": "com.android.settings.biometrics"
		},
		{
		"include-filter": "com.android.settings.biometrics2"
		}
		]
		}
		],
		"postsubmit": [
		{
		"name": "SettingsUnitTests",

color-check-baseline.xml

+3095 −1255

File changed.

Preview size limit exceeded, changes collapsed.

proguard.flags

+6 −12

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@
		-keepattributes Exceptions

		# Keep all Fragments in this package, which are used by reflection.
		-keep public class com.android.settings.** extends androidx.fragment.app.Fragment
		-keep public class com.android.settings.* extends androidx.fragment.app.Fragment

		# Keep all preference controllers needed by slice and DashboardFragment.
		-keep class * extends com.android.settings.core.BasePreferenceController {
		@@ -18,13 +18,13 @@
		}

		# We want to keep methods in Activity that could be used in the XML attribute onClick.
		-keepclassmembers class * extends android.app.Activity {
		-keepclassmembers class com.android.settings.* extends android.app.Activity {
		public void *(android.view.View);
		public void *(android.view.MenuItem);
		}

		# Keep setters in Views so that animations can still work.
		-keep public class * extends android.view.View {
		-keep public class com.android.settings.* extends android.view.View {
		public <init>(android.content.Context);
		public <init>(android.content.Context, android.util.AttributeSet);
		public <init>(android.content.Context, android.util.AttributeSet, int);
		@@ -34,22 +34,16 @@
		}

		# Keep classes that may be inflated from XML.
		-keepclasseswithmembers class * {
		-keepclasseswithmembers class com.android.settings.* {
		public <init>(android.content.Context, android.util.AttributeSet);
		}
		-keepclasseswithmembers class * {
		-keepclasseswithmembers class com.android.settings.* {
		public <init>(android.content.Context, android.util.AttributeSet, int);
		}
		-keepclasseswithmembers class * {
		-keepclasseswithmembers class com.android.settings.* {
		public <init>(android.content.Context, android.util.AttributeSet, int, int);
		}

		# Keep annotated classes or class members.
		-keep @androidx.annotation.Keep class *
		-keepclassmembers class * {
		@androidx.annotation.Keep *;
		}

		# Keep specific fields used via reflection.
		-keepclassmembers class * {
		public static ** SEARCH_INDEX_DATA_PROVIDER;