PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix SMS and Calls preference summary displays empty." into main am: 3bfb35c71e am: a72f3f4ecc

Browse Source 
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>
This commit is contained in:
Treehugger Robot
2024-04-09 04:35:47 +00:00
committed by Automerger Merge Worker
parent 523fd97cb4 a72f3f4ecc
commit d5e69fa0ea
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/xml/mobile_network_settings.xml
View File

@@ -36,6 +36,7 @@
<ListPreference <ListPreference
android:key="calls_preference" android:key="calls_preference"
android:title="@string/calls_preference" android:title="@string/calls_preference"
android:summary="@string/summary_placeholder"
android:enabled="false" android:enabled="false"
settings:controller="com.android.settings.network.telephony.CallsDefaultSubscriptionController" settings:controller="com.android.settings.network.telephony.CallsDefaultSubscriptionController"
settings:allowDividerAbove="true"/> settings:allowDividerAbove="true"/>
@@ -43,6 +44,7 @@
<ListPreference <ListPreference
android:key="sms_preference" android:key="sms_preference"
android:title="@string/sms_preference" android:title="@string/sms_preference"
android:summary="@string/summary_placeholder"
android:enabled="false" android:enabled="false"
settings:controller="com.android.settings.network.telephony.SmsDefaultSubscriptionController"/> settings:controller="com.android.settings.network.telephony.SmsDefaultSubscriptionController"/>

2
src/com/android/settings/network/telephony/DefaultSubscriptionController.java
View File

@@ -116,8 +116,6 @@ public abstract class DefaultSubscriptionController extends TelephonyBasePrefere
public void displayPreference(PreferenceScreen screen) { public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen); super.displayPreference(screen);
mPreference = screen.findPreference(getPreferenceKey()); mPreference = screen.findPreference(getPreferenceKey());
// Set a summary placeholder to reduce flicker.
mPreference.setSummaryProvider(pref -> mContext.getString(R.string.summary_placeholder));
updateEntries(); updateEntries();
} }