Merge changes from topic "MobileNetworkSettingsSearchIndex" into main (b7f68b4a) · Commits · e / os / android_packages_apps_Settings

Android.bp

+1 −6

Original line number	Diff line number	Diff line
		@@ -82,12 +82,10 @@ android_library {
		"android.hardware.dumpstate-V1-java",
		"android.hardware.dumpstate-V1.0-java",
		"android.hardware.dumpstate-V1.1-java",
		"android.view.accessibility.flags-aconfig-java",
		"com_android_server_accessibility_flags_lib",
		"net-utils-framework-common",
		"notification_flags_lib",
		"securebox",
		"android.os.flags-aconfig-java",
		"//frameworks/libs/systemui:com_android_systemui_shared_flags_lib",
		"WindowManager-Shell-shared-desktopMode",

		@@ -103,12 +101,9 @@ android_library {
		"contextualcards",
		"development_settings_flag_lib",
		"factory_reset_flags_lib",
		"fuelgauge-log-protos-lite",
		"settings-protos-lite",
		"fuelgauge-protos-lite",
		"settings-contextual-card-protos-lite",
		"settings-log-bridge-protos-lite",
		"settings-logtags",
		"settings-telephony-protos-lite",
		"statslog-settings",
		"telephony_flags_core_java_lib",
		"setupdesign-lottie-loading-layout",

+2 −34

Original line number	Diff line number	Diff line
		package {
		default_team: "trendy_team_android_settings_app",
		// See: http://go/android-license-faq
		// A large-scale-change added 'default_applicable_licenses' to import
		// all of the 'license_kinds' from "packages_apps_Settings_license"
		// to get the below license kinds:
		// SPDX-license-identifier-Apache-2.0
		default_applicable_licenses: ["packages_apps_Settings_license"],
		}

		java_library_static {
		name: "settings-contextual-card-protos-lite",
		host_supported: true,
		proto: {
		type: "lite",
		},
		srcs: ["contextual_card_list.proto"],
		}

		java_library_static {
		name: "settings-log-bridge-protos-lite",
		host_supported: true,
		proto: {
		type: "lite",
		},
		srcs: ["settings_log_bridge.proto"],
		}

		java_library_static {
		name: "settings-telephony-protos-lite",
		host_supported: true,
		proto: {
		type: "lite",
		},
		srcs: ["network_mode_choices.proto"],
		}

		java_library {
		name: "fuelgauge-log-protos-lite",
		name: "settings-protos-lite",
		proto: {
		type: "lite",
		},
		srcs: ["fuelgauge_log.proto"],
		srcs: ["*.proto"],
		}

0 → 100644

+34 −0

Original line number	Diff line number	Diff line
		syntax = "proto2";

		package com.android.settings.spa;

		message SpaSearchLandingKey {
		oneof page {
		SpaSearchLandingSpaPage spa_page = 1;
		SpaSearchLandingFragment fragment = 2;
		}
		}

		message SpaSearchLandingSpaPage {
		/** The destination of SPA page. */
		optional string destination = 1;
		}

		message SpaSearchLandingFragment {
		/** The fragment class name. */
		optional string fragment_name = 1;

		/** The key of the preference to highlight the item. */
		optional string preference_key = 2;

		/** The arguments passed to the page. */
		map<string, BundleValue> arguments = 3;
		}

		/** A value in an Android Bundle. */
		message BundleValue {
		oneof value {
		/** A 32-bit signed integer value. */
		int32 int_value = 1;
		}
		}

+2 −0

Original line number	Diff line number	Diff line
		@@ -112,10 +112,12 @@
		android:selectable="false"
		settings:searchable="false"/>

		<!-- Settings search is handled by MmsMessageSearchItem. -->
		<SwitchPreferenceCompat
		android:key="mms_message"
		android:title="@string/mms_message_title"
		android:summary="@string/mms_message_summary"
		settings:searchable="false"
		settings:controller="com.android.settings.network.telephony.MmsMessagePreferenceController"/>

		<SwitchPreferenceCompat

+1 −1

Original line number	Diff line number	Diff line
		@@ -34,7 +34,7 @@ object EmbeddedDeepLinkUtils {
		private const val TAG = "EmbeddedDeepLinkUtils"

		@JvmStatic
		fun Activity.tryStartMultiPaneDeepLink(
		fun Context.tryStartMultiPaneDeepLink(
		intent: Intent,
		highlightMenuKey: String? = null,
		): Boolean {