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

Commit 7981cc2f authored by Yuchen Sun's avatar Yuchen Sun Committed by Android (Google) Code Review
Browse files

Merge "Clean up preference_summary_default_combination in SystemUI." into main

parents 37706c62 24ad8d9a

packages/SystemUI/res/values/strings.xml

+0 −3
Original line number Diff line number Diff line
@@ -3214,9 +3214,6 @@ 


    <!-- Provider Model: Default title of the mobile network in the mobile layout. [CHAR LIMIT=50] -->

    <string name="mobile_data_settings_title">Mobile data</string>

    <!-- Provider Model: Summary text separator for preferences including a short description

         (eg. "Connected / 5G"). [CHAR LIMIT=50] -->

    <string name="preference_summary_default_combination"><xliff:g id="state" example="Connected">%1$s</xliff:g> / <xliff:g id="networkMode" example="LTE">%2$s</xliff:g></string>

    <!-- Provider Model:

         Summary indicating that a SIM has an active mobile data connection [CHAR LIMIT=50] -->

    <string name="mobile_data_connection_active">Connected</string>

packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogController.java

+2 −1
Original line number Diff line number Diff line
@@ -736,7 +736,8 @@ public class InternetDialogController implements AccessPointController.AccessPoi 
        // Set network description for the carrier network when connecting to the carrier network

        // under the airplane mode ON.

        if (activeNetworkIsCellular() || isCarrierNetworkActive()) {

            summary = context.getString(R.string.preference_summary_default_combination,

            summary = context.getString(

                    com.android.settingslib.R.string.preference_summary_default_combination,

                    context.getString(

                            isForDds // if nonDds is active, explains Dds status as poor connection

                                    ? (isOnNonDds ? R.string.mobile_data_poor_connection