diff options
| author | Jing Zhao <zhaojing@motorola.com> | 2014-08-26 14:44:02 -0500 |
|---|---|---|
| committer | Vineeta Srivastava <vsrivastava@google.com> | 2014-08-28 16:22:19 +0000 |
| commit | f04d69a1d405f88b2bebacd63c77e91789e81616 (patch) | |
| tree | efeb3d3a5f51965134a76557155387eb74387375 /src/com/android/settings/ApnEditor.java | |
| parent | ddc9b2ce2377edd7ce914813be374c91be150569 (diff) | |
| download | packages_apps_Settings-f04d69a1d405f88b2bebacd63c77e91789e81616.zip packages_apps_Settings-f04d69a1d405f88b2bebacd63c77e91789e81616.tar.gz packages_apps_Settings-f04d69a1d405f88b2bebacd63c77e91789e81616.tar.bz2 | |
Test APNs
Add test APNs to carriers table.
Enable APN Setting editing for testing PLMNs.
Allow user to toggle carrier_enabled for test APNs.
Bug: 17136661
Change-Id: Ieabfac5ea02a5b9971c7050d8278ad0095863e3a
Diffstat (limited to 'src/com/android/settings/ApnEditor.java')
| -rw-r--r-- | src/com/android/settings/ApnEditor.java | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/com/android/settings/ApnEditor.java b/src/com/android/settings/ApnEditor.java index 738d433..8cfee92 100644 --- a/src/com/android/settings/ApnEditor.java +++ b/src/com/android/settings/ApnEditor.java @@ -327,6 +327,13 @@ public class ApnEditor extends PreferenceActivity mMvnoType.setSummary( checkNull(mvnoDescription(mMvnoType.getValue()))); mMvnoMatchData.setSummary(checkNull(mMvnoMatchData.getText())); + // allow user to edit carrier_enabled for some APN + boolean ceEditable = getResources().getBoolean(R.bool.config_allow_edit_carrier_enabled); + if (ceEditable) { + mCarrierEnabled.setEnabled(true); + } else { + mCarrierEnabled.setEnabled(false); + } } /** @@ -571,6 +578,7 @@ public class ApnEditor extends PreferenceActivity values.put(Telephony.Carriers.MVNO_TYPE, checkNotSet(mMvnoType.getValue())); values.put(Telephony.Carriers.MVNO_MATCH_DATA, checkNotSet(mMvnoMatchData.getText())); + values.put(Telephony.Carriers.CARRIER_ENABLED, mCarrierEnabled.isChecked() ? 1 : 0); getContentResolver().update(mUri, values, null, null); return true; @@ -664,6 +672,8 @@ public class ApnEditor extends PreferenceActivity if (pref != null) { if (pref.equals(mPassword)){ pref.setSummary(starify(sharedPreferences.getString(key, ""))); + } else if (pref.equals(mCarrierEnabled)) { + // do nothing } else { pref.setSummary(checkNull(sharedPreferences.getString(key, ""))); } |