Merge "Fix SMS and Calls preference summary displays empty." into main am: 3bfb35c71e am: a72f3f4ecc
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3019410
Change-Id: I5c8ba3dc44ebe526ffd02ffbb0ef3a830a08b7d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/res/xml/mobile_network_settings.xml b/res/xml/mobile_network_settings.xml
index adb84b6..3c01109 100644
--- a/res/xml/mobile_network_settings.xml
+++ b/res/xml/mobile_network_settings.xml
@@ -36,6 +36,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"/>
@@ -43,6 +44,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 03ce7f6..024fb83 100644
--- a/src/com/android/settings/network/telephony/DefaultSubscriptionController.java
+++ b/src/com/android/settings/network/telephony/DefaultSubscriptionController.java
@@ -116,8 +116,6 @@
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();
}