[Satellite] Move satellite setting related code to a folder
Flag: EXEMPT refactor Fix: b/403149290 Test: build pass Test: atest pass Change-Id: I849adc99fb16d1278efd1d481a4fd99fadb45e98
This commit is contained in:
@@ -686,7 +686,7 @@
|
|||||||
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
|
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
|
||||||
android:value="true" />
|
android:value="true" />
|
||||||
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
|
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
|
||||||
android:value="com.android.settings.network.telephony.SatelliteSetting" />
|
android:value="com.android.settings.network.telephony.satellite.SatelliteSetting" />
|
||||||
<meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"
|
<meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"
|
||||||
android:value="@string/menu_key_network"/>
|
android:value="@string/menu_key_network"/>
|
||||||
</activity>
|
</activity>
|
||||||
|
@@ -205,7 +205,7 @@
|
|||||||
<PreferenceCategory
|
<PreferenceCategory
|
||||||
android:key="telephony_satellite_settings_category_key"
|
android:key="telephony_satellite_settings_category_key"
|
||||||
android:title="@string/category_title_satellite_connectivity"
|
android:title="@string/category_title_satellite_connectivity"
|
||||||
settings:controller="com.android.settings.network.telephony.SatelliteSettingsPreferenceCategoryController">
|
settings:controller="com.android.settings.network.telephony.satellite.SatelliteSettingsPreferenceCategoryController">
|
||||||
|
|
||||||
<com.android.settingslib.RestrictedPreference
|
<com.android.settingslib.RestrictedPreference
|
||||||
android:key="telephony_satellite_setting_key"
|
android:key="telephony_satellite_setting_key"
|
||||||
@@ -213,7 +213,7 @@
|
|||||||
android:title="@string/satellite_setting_title"
|
android:title="@string/satellite_setting_title"
|
||||||
settings:keywords="@string/keywords_satellite_setting"
|
settings:keywords="@string/keywords_satellite_setting"
|
||||||
settings:controller=
|
settings:controller=
|
||||||
"com.android.settings.network.telephony.SatelliteSettingPreferenceController"/>
|
"com.android.settings.network.telephony.satellite.SatelliteSettingPreferenceController"/>
|
||||||
|
|
||||||
</PreferenceCategory>
|
</PreferenceCategory>
|
||||||
|
|
||||||
|
@@ -66,7 +66,7 @@
|
|||||||
android:key="key_category_satellite_apps"
|
android:key="key_category_satellite_apps"
|
||||||
android:title="@string/category_title_satellite_supported_apps"
|
android:title="@string/category_title_satellite_supported_apps"
|
||||||
settings:isPreferenceVisible="false"
|
settings:isPreferenceVisible="false"
|
||||||
settings:controller="com.android.settings.network.telephony.SatelliteAppListCategoryController"
|
settings:controller="com.android.settings.network.telephony.satellite.SatelliteAppListCategoryController"
|
||||||
settings:searchable="false">
|
settings:searchable="false">
|
||||||
|
|
||||||
<!-- See all satellite apps -->
|
<!-- See all satellite apps -->
|
||||||
@@ -74,7 +74,7 @@
|
|||||||
android:key="key_see_all_satellite_apps"
|
android:key="key_see_all_satellite_apps"
|
||||||
android:title="@string/title_satellite_supported_app_list_entry"
|
android:title="@string/title_satellite_supported_app_list_entry"
|
||||||
android:icon="@drawable/ic_chevron_right_24dp"
|
android:icon="@drawable/ic_chevron_right_24dp"
|
||||||
android:fragment="com.android.settings.network.telephony.SatelliteAppListFragment"
|
android:fragment="com.android.settings.network.telephony.satellite.SatelliteAppListFragment"
|
||||||
android:order="5"
|
android:order="5"
|
||||||
settings:searchable="false"/>
|
settings:searchable="false"/>
|
||||||
</PreferenceCategory>
|
</PreferenceCategory>
|
||||||
|
@@ -153,7 +153,7 @@ import com.android.settings.network.apn.ApnSettings;
|
|||||||
import com.android.settings.network.telephony.CellularSecuritySettingsFragment;
|
import com.android.settings.network.telephony.CellularSecuritySettingsFragment;
|
||||||
import com.android.settings.network.telephony.MobileNetworkSettings;
|
import com.android.settings.network.telephony.MobileNetworkSettings;
|
||||||
import com.android.settings.network.telephony.NetworkSelectSettings;
|
import com.android.settings.network.telephony.NetworkSelectSettings;
|
||||||
import com.android.settings.network.telephony.SatelliteSetting;
|
import com.android.settings.network.telephony.satellite.SatelliteSetting;
|
||||||
import com.android.settings.network.tether.TetherSettings;
|
import com.android.settings.network.tether.TetherSettings;
|
||||||
import com.android.settings.nfc.PaymentSettings;
|
import com.android.settings.nfc.PaymentSettings;
|
||||||
import com.android.settings.notification.ConfigureNotificationSettings;
|
import com.android.settings.notification.ConfigureNotificationSettings;
|
||||||
|
@@ -58,6 +58,8 @@ import com.android.settings.network.telephony.cdma.CdmaSubscriptionPreferenceCon
|
|||||||
import com.android.settings.network.telephony.cdma.CdmaSystemSelectPreferenceController;
|
import com.android.settings.network.telephony.cdma.CdmaSystemSelectPreferenceController;
|
||||||
import com.android.settings.network.telephony.gsm.AutoSelectPreferenceController;
|
import com.android.settings.network.telephony.gsm.AutoSelectPreferenceController;
|
||||||
import com.android.settings.network.telephony.gsm.OpenNetworkSelectPagePreferenceController;
|
import com.android.settings.network.telephony.gsm.OpenNetworkSelectPagePreferenceController;
|
||||||
|
import com.android.settings.network.telephony.satellite.SatelliteSettingPreferenceController;
|
||||||
|
import com.android.settings.network.telephony.satellite.SatelliteSettingsPreferenceCategoryController;
|
||||||
import com.android.settings.network.telephony.wificalling.CrossSimCallingViewModel;
|
import com.android.settings.network.telephony.wificalling.CrossSimCallingViewModel;
|
||||||
import com.android.settings.search.BaseSearchIndexProvider;
|
import com.android.settings.search.BaseSearchIndexProvider;
|
||||||
import com.android.settings.wifi.WifiPickerTrackerHelper;
|
import com.android.settings.wifi.WifiPickerTrackerHelper;
|
||||||
|
@@ -14,7 +14,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package com.android.settings.network.telephony;
|
package com.android.settings.network.telephony.satellite;
|
||||||
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.content.pm.ApplicationInfo;
|
import android.content.pm.ApplicationInfo;
|
@@ -14,9 +14,9 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package com.android.settings.network.telephony;
|
package com.android.settings.network.telephony.satellite;
|
||||||
|
|
||||||
import static com.android.settings.network.telephony.SatelliteAppListCategoryController.getApplicationInfo;
|
import static com.android.settings.network.telephony.satellite.SatelliteAppListCategoryController.getApplicationInfo;
|
||||||
|
|
||||||
import android.app.settings.SettingsEnums;
|
import android.app.settings.SettingsEnums;
|
||||||
import android.content.Context;
|
import android.content.Context;
|
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 2024 The Android Open Source Project
|
* Copyright (C) 2025 The Android Open Source Project
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -14,7 +14,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package com.android.settings.network.telephony;
|
package com.android.settings.network.telephony.satellite;
|
||||||
|
|
||||||
import static android.telephony.CarrierConfigManager.CARRIER_ROAMING_NTN_CONNECT_AUTOMATIC;
|
import static android.telephony.CarrierConfigManager.CARRIER_ROAMING_NTN_CONNECT_AUTOMATIC;
|
||||||
import static android.telephony.CarrierConfigManager.CARRIER_ROAMING_NTN_CONNECT_MANUAL;
|
import static android.telephony.CarrierConfigManager.CARRIER_ROAMING_NTN_CONNECT_MANUAL;
|
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 2024 The Android Open Source Project
|
* Copyright (C) 2025 The Android Open Source Project
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -14,7 +14,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package com.android.settings.network.telephony;
|
package com.android.settings.network.telephony.satellite;
|
||||||
|
|
||||||
import static android.telephony.CarrierConfigManager.CARRIER_ROAMING_NTN_CONNECT_AUTOMATIC;
|
import static android.telephony.CarrierConfigManager.CARRIER_ROAMING_NTN_CONNECT_AUTOMATIC;
|
||||||
import static android.telephony.CarrierConfigManager.KEY_CARRIER_ROAMING_NTN_CONNECT_TYPE_INT;
|
import static android.telephony.CarrierConfigManager.KEY_CARRIER_ROAMING_NTN_CONNECT_TYPE_INT;
|
||||||
@@ -44,6 +44,7 @@ import androidx.preference.PreferenceScreen;
|
|||||||
import com.android.settings.R;
|
import com.android.settings.R;
|
||||||
import com.android.settings.SettingsActivity;
|
import com.android.settings.SettingsActivity;
|
||||||
import com.android.settings.network.CarrierConfigCache;
|
import com.android.settings.network.CarrierConfigCache;
|
||||||
|
import com.android.settings.network.telephony.TelephonyBasePreferenceController;
|
||||||
|
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.List;
|
import java.util.List;
|
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 2024 The Android Open Source Project
|
* Copyright (C) 2025 The Android Open Source Project
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -14,7 +14,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package com.android.settings.network.telephony;
|
package com.android.settings.network.telephony.satellite;
|
||||||
|
|
||||||
import static android.telephony.CarrierConfigManager.CARRIER_ROAMING_NTN_CONNECT_AUTOMATIC;
|
import static android.telephony.CarrierConfigManager.CARRIER_ROAMING_NTN_CONNECT_AUTOMATIC;
|
||||||
import static android.telephony.CarrierConfigManager.KEY_CARRIER_ROAMING_NTN_CONNECT_TYPE_INT;
|
import static android.telephony.CarrierConfigManager.KEY_CARRIER_ROAMING_NTN_CONNECT_TYPE_INT;
|
||||||
@@ -39,6 +39,7 @@ import androidx.preference.PreferenceScreen;
|
|||||||
|
|
||||||
import com.android.settings.flags.Flags;
|
import com.android.settings.flags.Flags;
|
||||||
import com.android.settings.network.CarrierConfigCache;
|
import com.android.settings.network.CarrierConfigCache;
|
||||||
|
import com.android.settings.network.telephony.TelephonyBasePreferenceController;
|
||||||
|
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.List;
|
import java.util.List;
|
@@ -14,11 +14,11 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package com.android.settings.network.telephony;
|
package com.android.settings.network.telephony.satellite;
|
||||||
|
|
||||||
import static com.android.settings.core.BasePreferenceController.AVAILABLE;
|
import static com.android.settings.core.BasePreferenceController.AVAILABLE;
|
||||||
import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
|
import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
|
||||||
import static com.android.settings.network.telephony.SatelliteAppListCategoryController.MAXIMUM_OF_PREFERENCE_AMOUNT;
|
import static com.android.settings.network.telephony.satellite.SatelliteAppListCategoryController.MAXIMUM_OF_PREFERENCE_AMOUNT;
|
||||||
|
|
||||||
import static com.google.common.truth.Truth.assertThat;
|
import static com.google.common.truth.Truth.assertThat;
|
||||||
|
|
@@ -14,7 +14,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package com.android.settings.network.telephony;
|
package com.android.settings.network.telephony.satellite;
|
||||||
|
|
||||||
import static com.google.common.truth.Truth.assertThat;
|
import static com.google.common.truth.Truth.assertThat;
|
||||||
|
|
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 2024 The Android Open Source Project
|
* Copyright (C) 2025 The Android Open Source Project
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -14,7 +14,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package com.android.settings.network.telephony;
|
package com.android.settings.network.telephony.satellite;
|
||||||
|
|
||||||
import static android.telephony.CarrierConfigManager.CARRIER_ROAMING_NTN_CONNECT_AUTOMATIC;
|
import static android.telephony.CarrierConfigManager.CARRIER_ROAMING_NTN_CONNECT_AUTOMATIC;
|
||||||
import static android.telephony.CarrierConfigManager.CARRIER_ROAMING_NTN_CONNECT_MANUAL;
|
import static android.telephony.CarrierConfigManager.CARRIER_ROAMING_NTN_CONNECT_MANUAL;
|
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 2024 The Android Open Source Project
|
* Copyright (C) 2025 The Android Open Source Project
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -14,7 +14,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package com.android.settings.network.telephony;
|
package com.android.settings.network.telephony.satellite;
|
||||||
|
|
||||||
import static android.telephony.CarrierConfigManager.CARRIER_ROAMING_NTN_CONNECT_AUTOMATIC;
|
import static android.telephony.CarrierConfigManager.CARRIER_ROAMING_NTN_CONNECT_AUTOMATIC;
|
||||||
import static android.telephony.CarrierConfigManager.CARRIER_ROAMING_NTN_CONNECT_MANUAL;
|
import static android.telephony.CarrierConfigManager.CARRIER_ROAMING_NTN_CONNECT_MANUAL;
|
Reference in New Issue
Block a user