From c9017355d9467d0c05e82d3292679e4728d593e0 Mon Sep 17 00:00:00 2001 From: tomhsu Date: Tue, 19 Nov 2024 03:30:03 +0000 Subject: [PATCH] [Satellite] Add category UI for Satellite functions Flag: com.android.settings.flags.satellite_oem_settings_ux_migration Fix: b/378408939 Test: atest pass Test: make pass Change-Id: Id0f2ba047f4ee71a9ae398aa828978097717ce1a --- res/values/strings.xml | 2 + res/xml/mobile_network_settings.xml | 23 ++-- .../telephony/MobileNetworkSettings.java | 6 + ...eSettingsPreferenceCategoryController.java | 70 ++++++++++ ...tingsPreferenceCategoryControllerTest.java | 127 ++++++++++++++++++ 5 files changed, 220 insertions(+), 8 deletions(-) create mode 100644 src/com/android/settings/network/telephony/SatelliteSettingsPreferenceCategoryController.java create mode 100644 tests/unit/src/com/android/settings/network/telephony/SatelliteSettingsPreferenceCategoryControllerTest.java diff --git a/res/values/strings.xml b/res/values/strings.xml index b62df6081ee..3d359b0cefc 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -12212,6 +12212,8 @@ Can’t turn on %1$s To turn on %1$s, first end the satellite connection + + Satellite connectivity diff --git a/res/xml/mobile_network_settings.xml b/res/xml/mobile_network_settings.xml index 29e7c253943..fb20dceacd3 100644 --- a/res/xml/mobile_network_settings.xml +++ b/res/xml/mobile_network_settings.xml @@ -204,6 +204,21 @@ settings:enableCopying="true" settings:controller="com.android.settings.network.telephony.MobileNetworkEidPreferenceController"/> + + + + + + - -