Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a72f3f4e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3019410



Change-Id: I8abc1df5716862a6296d50c89681cad73bc9c8b5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 158f1d1c 3bfb35c7

res/xml/mobile_network_settings.xml

+2 −0
Original line number Diff line number Diff line
@@ -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"/>

src/com/android/settings/network/telephony/DefaultSubscriptionController.java

+0 −2
Original line number Diff line number Diff line
@@ -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();

    }