PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I3b0ecad412e5f2c84135d7510e105898f1668334
This commit is contained in:
Betty Chang
2021-12-07 06:15:18 +00:00
committed by Automerger Merge Worker
parent 0a3cbd319e 7e1d82caad
commit e4cdb4eeaa
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/wifi/WifiConfigController.java
View File

@@ -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);
}
}

12
src/com/android/settings/wifi/WifiConfigController2.java
View File

@@ -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);
}
}