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

Merge "MVNO value is not grayed out when MVNO type is none" into nyc-dev

Browse Source 
am: e652b7b

* commit 'e652b7b0cade699a396f55602f5d7a282466c705':
  MVNO value is not grayed out when MVNO type is none

Change-Id: I12079a64d44b8578d258ef0afd4391b53016c709
This commit is contained in:
Wei Huang
2016-04-01 19:13:19 +00:00
committed by android-build-merger
parent d5eb67f566 e652b7b0ca
commit ea4ca2e096
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/ApnEditor.java
View File

@@ -453,11 +453,7 @@ public class ApnEditor extends InstrumentedPreferenceActivity
return null; return null;
} else { } else {
String[] values = mRes.getStringArray(R.array.mvno_type_entries); String[] values = mRes.getStringArray(R.array.mvno_type_entries);
if (values[mvnoIndex].equals("None")) { mMvnoMatchData.setEnabled(mvnoIndex != 0);
mMvnoMatchData.setEnabled(false);
} else {
mMvnoMatchData.setEnabled(true);
}
if (newValue != null && newValue.equals(oldValue) == false) { if (newValue != null && newValue.equals(oldValue) == false) {
if (values[mvnoIndex].equals("SPN")) { if (values[mvnoIndex].equals("SPN")) {
mMvnoMatchData.setText(mTelephonyManager.getSimOperatorName()); mMvnoMatchData.setText(mTelephonyManager.getSimOperatorName());