Merge "Fix mvno data field summary not update issue" am: 4615179fc5 am: 36c9ca1f2c am: f876f3d0cc am: 442a99bedf am: 10a88c97b7

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

Change-Id: I11b412ef999343e26fb32bff7ccc25aacced3034
This commit is contained in:
Treehugger Robot
2020-07-21 08:01:03 +00:00
committed by Automerger Merge Worker

View File

@@ -726,6 +726,9 @@ public class ApnEditor extends SettingsPreferenceFragment
telephonyManager = telephonyManagerForSubId; telephonyManager = telephonyManagerForSubId;
} }
mMvnoMatchData.setText(telephonyManager.getGroupIdLevel1()); mMvnoMatchData.setText(telephonyManager.getGroupIdLevel1());
} else {
// mvno type 'none' case. At this time, mvnoIndex should be 0.
mMvnoMatchData.setText("");
} }
} }
@@ -784,6 +787,7 @@ public class ApnEditor extends SettingsPreferenceFragment
} }
mMvnoType.setValue((String) newValue); mMvnoType.setValue((String) newValue);
mMvnoType.setSummary(mvno); mMvnoType.setSummary(mvno);
mMvnoMatchData.setSummary(checkNull(mMvnoMatchData.getText()));
} else if (KEY_PASSWORD.equals(key)) { } else if (KEY_PASSWORD.equals(key)) {
mPassword.setSummary(starify(newValue != null ? String.valueOf(newValue) : "")); mPassword.setSummary(starify(newValue != null ? String.valueOf(newValue) : ""));
} else if (KEY_CARRIER_ENABLED.equals(key)) { } else if (KEY_CARRIER_ENABLED.equals(key)) {