Merge "Fix SMS and Calls preference summary displays empty." into main am: 3bfb35c71e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3019410 Change-Id: I8abc1df5716862a6296d50c89681cad73bc9c8b5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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"/>
|
||||
|
||||
|
@@ -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();
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user