Merge 25Q1 (ab/12770256) to aosp-main-future

Bug: 385190204
Merged-In: Iaee6792d1a27be8fa4b443f783a47a3715b6d3a1
Change-Id: I0ac29cecfec526a38cf4a120b8ef704ee7bc01b3

aconfig/catalyst/about_phone.aconfig

@@ -15,3 +15,9 @@ flag {
   bug: "323791114"
 }
 
+flag {
+  name: "catalyst_my_device_info_pref_screen"
+  namespace: "android_settings"
+  description: "Flag for About phone"
+  bug: "323791114"
+}

aconfig/catalyst/accessibility.aconfig

@@ -0,0 +1,16 @@
+package: "com.android.settings.flags"
+container: "system"
+
+flag {
+  name: "catalyst_accessibility_color_and_motion"
+  namespace: "android_settings"
+  description: "Migrate Color and motion screen to the Catalyst infrastructure"
+  bug: "323791114"
+}
+
+flag {
+  name: "catalyst_text_reading_screen"
+  namespace: "android_settings"
+  description: "Flag for Display size and text"
+  bug: "323791114"
+}

aconfig/catalyst/battery.aconfig

@@ -0,0 +1,16 @@
+package: "com.android.settings.flags"
+container: "system"
+
+flag {
+  name: "catalyst_power_usage_summary_screen"
+  namespace: "android_settings"
+  description: "Flag for Battery screen"
+  bug: "323791114"
+}
+
+flag {
+  name: "catalyst_battery_saver_screen"
+  namespace: "android_settings"
+  description: "Flag for Battery Saver"
+  bug: "323791114"
+}

aconfig/catalyst/connected_devices.aconfig

@@ -0,0 +1,9 @@
+package: "com.android.settings.flags"
+container: "system"
+
+flag {
+  name: "catalyst_bluetooth_switchbar_screen"
+  namespace: "android_settings"
+  description: "Flag for Bluetooth"
+  bug: "323791114"
+}

aconfig/catalyst/display.aconfig

@@ -0,0 +1,30 @@
+package: "com.android.settings.flags"
+container: "system"
+
+flag {
+  name: "catalyst_display_settings_screen"
+  namespace: "android_settings"
+  description: "Flag for Display"
+  bug: "323791114"
+}
+
+flag {
+  name: "catalyst_screen_timeout"
+  namespace: "android_settings"
+  description: "Flag for Screen Timeout settings"
+  bug: "323791114"
+}
+
+flag {
+  name: "catalyst_dark_ui_mode"
+  namespace: "android_settings"
+  description: "Flag for Dark theme"
+  bug: "323791114"
+}
+
+flag {
+  name: "catalyst_screen_brightness_mode"
+  namespace: "android_settings"
+  description: "Flag for Adaptive brightness"
+  bug: "323791114"
+}

aconfig/catalyst/location.aconfig

@@ -0,0 +1,9 @@
+package: "com.android.settings.flags"
+container: "system"
+
+flag {
+  name: "catalyst_location_settings"
+  namespace: "android_settings"
+  description: "Flag for Location"
+  bug: "323791114"
+}

aconfig/catalyst/lockscreen.aconfig

@@ -0,0 +1,9 @@
+package: "com.android.settings.flags"
+container: "system"
+
+flag {
+  name: "catalyst_lockscreen_from_display_settings"
+  namespace: "android_settings"
+  description: "Flag for Display & touch > Lock screen"
+  bug: "323791114"
+}

aconfig/catalyst/network_and_internet.aconfig

@@ -0,0 +1,52 @@
+package: "com.android.settings.flags"
+container: "system"
+
+flag {
+  name: "catalyst_network_provider_and_internet_screen"
+  namespace: "android_settings"
+  description: "Flag for Network & Internet"
+  bug: "323791114"
+}
+
+flag {
+  name: "catalyst_internet_settings"
+  namespace: "android_settings"
+  description: "Flag for Internet"
+  bug: "323791114"
+}
+
+flag {
+  name: "catalyst_mobile_network_list"
+  namespace: "android_settings"
+  description: "Flag for SIMs"
+  bug: "323791114"
+}
+
+flag {
+  name: "catalyst_tether_settings"
+  namespace: "android_settings"
+  description: "Flag for Hotspot & tethering"
+  bug: "323791114"
+}
+
+flag {
+  name: "catalyst_adaptive_connectivity"
+  namespace: "android_settings"
+  description: "Flag for Adaptive connectivity"
+  bug: "323791114"
+}
+
+flag {
+  name: "catalyst_wifi_calling"
+  namespace: "android_settings"
+  description: "Flag for Wi-Fi calling screen"
+  bug: "323791114"
+}
+
+flag {
+  name: "catalyst_restrict_background_parent_entry"
+  namespace: "android_settings"
+  description: "Flag for Data Saver"
+  bug: "323791114"
+}
+

aconfig/catalyst/sound_screen.aconfig

@@ -0,0 +1,16 @@
+package: "com.android.settings.flags"
+container: "system"
+
+flag {
+    name: "catalyst_sound_screen"
+    namespace: "android_settings"
+    description: "Flag for sound and vibration page"
+    bug: "323791114"
+}
+
+flag {
+    name: "catalyst_vibration_intensity_screen"
+    namespace: "android_settings"
+    description: "Flag for vibration and haptics page"
+    bug: "323791114"
+}

aconfig/catalyst/system.aconfig

@@ -0,0 +1,9 @@
+package: "com.android.settings.flags"
+container: "system"
+
+flag {
+    name: "catalyst_language_setting"
+    namespace: "android_settings"
+    description: "Flag for System -> Languages screen"
+    bug: "323791114"
+}

aconfig/keyboard/settings_keyboard_layout_picker_features.aconfig

@@ -0,0 +1,9 @@
+package: "com.android.settings.keyboard"
+container: "system"
+
+flag {
+  name: "keyboard_layout_picker_activity_enabled"
+  namespace: "input"
+  description: "This flag enables or disables exposed page of keyboard layout picker"
+  bug: "345399212"
+}

aconfig/settings_biometrics_integration_declarations.aconfig

@@ -15,3 +15,40 @@ flag {
   bug: "301226085"
 }
 
+flag {
+  name: "enroll_layout_truncate_improvement"
+  namespace: "biometrics_integration"
+  description: "This flag controls whether the enroll layout truncate improvement feature should be enabled"
+  bug: "359149850"
+  metadata {
+      purpose: PURPOSE_BUGFIX
+  }
+}
+
+flag {
+  name: "screen_off_unlock_power_optimization"
+  namespace: "biometrics_integration"
+  description: "This flag controls Whether to gate fp unlock when screen turns off feature before AOC optimized"
+  bug: "368465560"
+  metadata {
+      purpose: PURPOSE_BUGFIX
+  }
+}
+
+flag {
+  name: "biometrics_onboarding_education"
+  namespace: "biometrics_integration"
+  description: "This flag controls whether the onboarding education settings UX should be enabled"
+  bug: "370940762"
+}
+
+flag {
+  name: "biometric_onboarding_education"
+  namespace: "biometrics_integration"
+  description: "This flag controls whether the onboarding education settings UX should be enabled"
+  bug: "370940762"
+  metadata {
+      purpose: PURPOSE_BUGFIX
+  }
+}
+

aconfig/settings_connecteddevice_flag_declarations.aconfig

@@ -15,6 +15,13 @@ flag {
   bug: "253296253"
 }
 
+flag {
+  name: "display_topology_pane_in_display_list"
+  namespace: "display_manager"
+  description: "Shows the connected display setting and shows the topology pane in the display list, even with only one display connected."
+  bug: "352648432"
+}
+
 flag {
   name: "enable_auth_challenge_for_usb_preferences"
   namespace: "safety_center"

aconfig/settings_datetime_flag_declarations.aconfig

@@ -9,3 +9,11 @@ flag {
     bug: "283239837"
 }
 
+flag {
+    name: "revamp_toggles"
+    # "location" is used by the Android System Time team for feature flags.
+    namespace: "location"
+    description: "Makes the use location toggle dependent on automatic time zone detection"
+    bug: "296835792"
+}
+

aconfig/settings_development_flag_declarations.aconfig

@@ -19,3 +19,10 @@ flag {
   description: "Shows hdr/sdr dev opton on the development options page from aconfig"
   bug: "291863102"
 }
+
+flag {
+  name: "page_size_app_compat_setting"
+  namespace: "devoptions_settings"
+  description: "Flag to enable page size app compat mode from Settings."
+  bug: "371049373"
+}

aconfig/settings_experience_flag_declarations.aconfig

@@ -17,3 +17,14 @@ flag {
         purpose: PURPOSE_BUGFIX
     }
 }
+
+flag {
+    name: "satellite_oem_settings_ux_migration"
+    namespace: "settings_experience"
+    description: "Migrate satellite UX to Android Settings"
+    bug: "378781925"
+    metadata {
+        purpose: PURPOSE_BUGFIX
+    }
+}
+

aconfig/settings_flag_declarations.aconfig

@@ -63,3 +63,10 @@ flag {
   description: "Flag for all screens"
   bug: "323791114"
 }
+
+flag {
+  name: "catalyst_service"
+  namespace: "android_settings"
+  description: "Flag for catalyst service"
+  bug: "323791114"
+}

aconfig/settings_globalintl_flag_declarations.aconfig

@@ -21,3 +21,10 @@ flag {
     description: "Feature flag for B&R accessibility appearance settings"
     bug: "341210043"
 }
+
+flag {
+    name: "regional_preferences_api_enabled"
+    namespace: "globalintl"
+    description: "Feature flag for regional preferences APIs"
+    bug: "370379000"
+}

aconfig/settings_telephony_flag_declarations.aconfig

@@ -14,3 +14,19 @@ flag {
     description: "Control the Dual SIM onobarding feature"
     bug: "298898436"
 }
+
+# OWNER=yomna TARGET=25Q2
+flag {
+    name: "mobile_network_security_2g_toggle"
+    namespace: "hardware_backed_security"
+    description: "Exposing 2G toggles in Mobile Network Security page"
+    bug: "355062720"
+}
+
+# OWNER=yomna TARGET=25Q2
+flag {
+    name: "add_security_algorithms_to_eng_menu"
+    namespace: "hardware_backed_security"
+    description: "Exposing security transparency features to field engineering menu"
+    bug: "355062720"
+}