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

Commit 7e1d82ca authored by Betty Chang's avatar Betty Chang Committed by Automerger Merge Worker
Browse files

Merge "To get Display name by active subscription info" into sc-v2-dev am: a22e367f 

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

Change-Id: I5cd1fb261043cfe4ff478792c11367f249e5c385
parents 3a008453 a22e367f

src/com/android/settings/wifi/WifiConfigController.java

+8 −4
Original line number Diff line number Diff line
@@ -1503,11 +1503,15 @@ public class WifiConfigController implements TextWatcher, 
        }



        // Shows display name of each active subscription.

        final String[] displayNames = SubscriptionUtil.getUniqueSubscriptionDisplayNames(

                mContext).values().stream().toArray(String[]::new);

        mEapSimSpinner.setAdapter(getSpinnerAdapter(displayNames));

        final ArrayList<CharSequence> displayNames = new ArrayList<>();

        for (SubscriptionInfo activeSubInfo : mActiveSubscriptionInfos) {

            displayNames.add(

                SubscriptionUtil.getUniqueSubscriptionDisplayName(activeSubInfo, mContext));

        }

        mEapSimSpinner.setAdapter(

            getSpinnerAdapter(displayNames.toArray(new String[displayNames.size()])));

        mEapSimSpinner.setSelection(0 /* position */);

        if (displayNames.length == 1) {

        if (displayNames.size() == 1) {

            mEapSimSpinner.setEnabled(false);

        }

    }

src/com/android/settings/wifi/WifiConfigController2.java

+8 −4
Original line number Diff line number Diff line
@@ -1482,11 +1482,15 @@ public class WifiConfigController2 implements TextWatcher, 
        }



        // Shows display name of each active subscription.

        final String[] displayNames = SubscriptionUtil.getUniqueSubscriptionDisplayNames(

                mContext).values().stream().toArray(String[]::new);

        mEapSimSpinner.setAdapter(getSpinnerAdapter(displayNames));

        final ArrayList<CharSequence> displayNames = new ArrayList<>();

        for (SubscriptionInfo activeSubInfo : mActiveSubscriptionInfos) {

            displayNames.add(

                    SubscriptionUtil.getUniqueSubscriptionDisplayName(activeSubInfo, mContext));

        }

        mEapSimSpinner.setAdapter(

                getSpinnerAdapter(displayNames.toArray(new String[displayNames.size()])));

        mEapSimSpinner.setSelection(0 /* position */);

        if (displayNames.length == 1) {

        if (displayNames.size() == 1) {

            mEapSimSpinner.setEnabled(false);

        }

    }