diff --git a/res/values/strings.xml b/res/values/strings.xml
index 28e3ba64bc6..3cef0b81742 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3695,10 +3695,6 @@
While docked
-
-
- Satellite messaging
-
APNs
@@ -12687,8 +12683,10 @@ Data usage charges may apply.
Invalid Network Mode %1$d. Ignore.
-
- Satellite messaging
+
+
+
+ Satellite connectivity
Send and receive text messages by satellite. Included with your account.
@@ -12731,14 +12729,14 @@ Data usage charges may apply.
A satellite connection may be slower and is available only in some areas. Weather and certain structures may affect the connection. Calling by satellite isn\u2019t available. Emergency calls may still connect.\n\nIt may take some time for account changes to show in Settings. Contact %1$s for details.
A satellite connection may be slower and is available only in some areas. Weather and certain structures may affect the connection. Calling by satellite isn\u2019t available. Emergency calls may still connect. Texting with emergency services may not be available in all areas.\n\nIt may take some time for account changes to show in Settings. Contact %1$s for details.
-
- More about %1$s
+
+ More about satellite connectivity
Can’t turn on %1$s
To turn on %1$s, first end the satellite connection
- Satellite connectivity
+ Satellite
Satellite connectivity
diff --git a/res/xml/mobile_network_settings.xml b/res/xml/mobile_network_settings.xml
index a0da44051c6..12f3bebdb73 100644
--- a/res/xml/mobile_network_settings.xml
+++ b/res/xml/mobile_network_settings.xml
@@ -210,7 +210,7 @@
diff --git a/src/com/android/settings/network/telephony/satellite/SatelliteSetting.java b/src/com/android/settings/network/telephony/satellite/SatelliteSetting.java
index 851038a7a45..0540912a9a9 100644
--- a/src/com/android/settings/network/telephony/satellite/SatelliteSetting.java
+++ b/src/com/android/settings/network/telephony/satellite/SatelliteSetting.java
@@ -133,7 +133,6 @@ public class SatelliteSetting extends RestrictedDashboardFragment {
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
boolean isSatelliteEligible = isSatelliteEligible();
- updateTitle();
updateMobilePlan(isSatelliteEligible);
updateHowItWorksContent(isSatelliteEligible);
updateFooterContent();
@@ -149,10 +148,6 @@ public class SatelliteSetting extends RestrictedDashboardFragment {
return R.xml.satellite_setting;
}
- private void updateTitle() {
- findPreference("satellite_setting").setTitle(getSubjectString());
- }
-
private void updateMobilePlan(boolean isSatelliteEligible) {
PreferenceCategory prefCategory = findPreference(PREF_KEY_CATEGORY_YOUR_SATELLITE_PLAN);
if (prefCategory == null || !mConfigBundle.getBoolean(
@@ -238,7 +233,7 @@ public class SatelliteSetting extends RestrictedDashboardFragment {
final String[] link = new String[1];
link[0] = readSatelliteMoreInfoString();
- if (link[0] != null && !link[0].isEmpty()) {
+ if (true) {
footerPreference.setLearnMoreAction(view -> {
if (!link[0].isEmpty()) {
Intent helpIntent = HelpUtils.getHelpIntent(mActivity, link[0],
@@ -250,7 +245,7 @@ public class SatelliteSetting extends RestrictedDashboardFragment {
});
footerPreference.setLearnMoreText(
- getString(R.string.more_about_satellite_messaging, getDescriptionString()));
+ getString(R.string.more_about_satellite_messaging));
}
}
}
@@ -304,32 +299,6 @@ public class SatelliteSetting extends RestrictedDashboardFragment {
return mConfigBundle.getBoolean(KEY_SATELLITE_ATTACH_SUPPORTED_BOOL, false);
}
- // This is for a word which first letter is uppercase. e.g. Satellite messaging.
- private String getSubjectString() {
- int result;
- if (com.android.settings.flags.Flags.satelliteOemSettingsUxMigration()) {
- result = mIsServiceDataType
- ? R.string.title_satellite_setting_connectivity
- : R.string.satellite_setting_title;
- } else {
- result = R.string.satellite_setting_title;
- }
- return getString(result);
- }
-
- // This is for a word without uppercase letter. e.g. satellite messaging.
- private String getDescriptionString() {
- int result;
- if (com.android.settings.flags.Flags.satelliteOemSettingsUxMigration()) {
- result = mIsServiceDataType
- ? R.string.description_satellite_setting_connectivity
- : R.string.description_satellite_setting_messaging;
- } else {
- result = R.string.satellite_setting_title;
- }
- return getString(result);
- }
-
private static void loge(String message) {
Log.e(TAG, message);
}
diff --git a/src/com/android/settings/network/telephony/satellite/SatelliteSettingPreferenceController.java b/src/com/android/settings/network/telephony/satellite/SatelliteSettingPreferenceController.java
index 18217fd5d62..1ecbf47deef 100644
--- a/src/com/android/settings/network/telephony/satellite/SatelliteSettingPreferenceController.java
+++ b/src/com/android/settings/network/telephony/satellite/SatelliteSettingPreferenceController.java
@@ -145,7 +145,6 @@ public class SatelliteSettingPreferenceController extends
public void updateState(@Nullable Preference preference) {
super.updateState(preference);
if (preference != null && preference.getKey().equals(getPreferenceKey())) {
- updateTitle(preference);
updateSummary(preference);
}
}
@@ -170,12 +169,6 @@ public class SatelliteSettingPreferenceController extends
return false;
}
- private void updateTitle(Preference preference) {
- preference.setTitle(mCarrierRoamingNtnModeCallback.isSatelliteServiceDataType()
- ? R.string.title_satellite_setting_connectivity
- : R.string.satellite_setting_title);
- }
-
private void updateSummary(Preference preference) {
if (preference == null) {
logd("updateSummary - no Preference");