diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-04-09 03:55:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-04-09 03:55:17 +0000 |
| commit | 3bfb35c71e569ca3f21efa43e67888166df0acb3 (patch) | |
| tree | 5fd904d6b8df01c58242da5e3a1c772064364757 | |
| parent | c37f89dff9c28f30de768ab8573058e0ee24aae6 (diff) | |
| parent | 27255b7a7ca9ff0ec49c432b8338e7390dbb47dc (diff) | |
| download | Settings-3bfb35c71e569ca3f21efa43e67888166df0acb3.tar.gz | |
Merge "Fix SMS and Calls preference summary displays empty." into main
| -rw-r--r-- | res/xml/mobile_network_settings.xml | 2 | ||||
| -rw-r--r-- | src/com/android/settings/network/telephony/DefaultSubscriptionController.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/res/xml/mobile_network_settings.xml b/res/xml/mobile_network_settings.xml index 62a88b75646..8b59f80bfa6 100644 --- a/res/xml/mobile_network_settings.xml +++ b/res/xml/mobile_network_settings.xml @@ -37,6 +37,7 @@ <ListPreference android:key="calls_preference" android:title="@string/calls_preference" + android:summary="@string/summary_placeholder" android:enabled="false" settings:controller="com.android.settings.network.telephony.CallsDefaultSubscriptionController" settings:allowDividerAbove="true"/> @@ -44,6 +45,7 @@ <ListPreference android:key="sms_preference" android:title="@string/sms_preference" + android:summary="@string/summary_placeholder" android:enabled="false" settings:controller="com.android.settings.network.telephony.SmsDefaultSubscriptionController"/> diff --git a/src/com/android/settings/network/telephony/DefaultSubscriptionController.java b/src/com/android/settings/network/telephony/DefaultSubscriptionController.java index 206b3a9cc08..84263821e50 100644 --- a/src/com/android/settings/network/telephony/DefaultSubscriptionController.java +++ b/src/com/android/settings/network/telephony/DefaultSubscriptionController.java @@ -112,8 +112,6 @@ public abstract class DefaultSubscriptionController extends TelephonyBasePrefere public void displayPreference(PreferenceScreen screen) { super.displayPreference(screen); mPreference = screen.findPreference(getPreferenceKey()); - // Set a summary placeholder to reduce flicker. - mPreference.setSummaryProvider(pref -> mContext.getString(R.string.summary_placeholder)); updateEntries(); } |