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

Commit faac8d0f authored by Peter Wang's avatar Peter Wang Committed by Android (Google) Code Review
Browse files

Merge "Use translated name ("SIM") for default profile display name ("CARD")" into sc-dev

parents d22c1aaa d368e85c

src/com/android/settings/network/SubscriptionUtil.java

+5 −1
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ import java.util.stream.Stream; 


public class SubscriptionUtil {

    private static final String TAG = "SubscriptionUtil";

    private static final String PROFILE_GENERIC_DISPLAY_NAME = "CARD";

    private static List<SubscriptionInfo> sAvailableResultsForTesting;

    private static List<SubscriptionInfo> sActiveResultsForTesting;
@@ -257,7 +258,10 @@ public class SubscriptionUtil { 
                .map(i -> {

                    DisplayInfo info = new DisplayInfo();

                    info.subscriptionInfo = i;

                    info.originalName = i.getDisplayName().toString().trim();

                    String displayName = i.getDisplayName().toString();

                    info.originalName = TextUtils.equals(displayName, PROFILE_GENERIC_DISPLAY_NAME)

                            ? context.getResources().getString(R.string.sim_card)

                            : displayName.trim();

                    return info;

                });