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

Commit 3bfb35c7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix SMS and Calls preference summary displays empty." into main

parents c37f89df 27255b7a

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();

    }