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

Fix ApnEditor UI -- specifically protocol and roamingProtocol summary

Browse Source 
Summary was being overwritten with the value for these fields.

Bug: 28962919
Change-Id: I563213b10253b1c519c31762186c922368d38ef9
This commit is contained in:
Amit Mahajan
2016-05-25 13:22:18 -07:00
parent 33658f63af
commit 91fb480efa
1 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -56,6 +56,7 @@ public class ApnEditor extends InstrumentedPreferenceActivity
private final static String KEY_CARRIER_ENABLED = "carrier_enabled"; private final static String KEY_CARRIER_ENABLED = "carrier_enabled";
private final static String KEY_BEARER_MULTI = "bearer_multi"; private final static String KEY_BEARER_MULTI = "bearer_multi";
private final static String KEY_MVNO_TYPE = "mvno_type"; private final static String KEY_MVNO_TYPE = "mvno_type";
private final static String KEY_PASSWORD = "apn_password";
private static final int MENU_DELETE = Menu.FIRST; private static final int MENU_DELETE = Menu.FIRST;
private static final int MENU_SAVE = Menu.FIRST + 1; private static final int MENU_SAVE = Menu.FIRST + 1;
@@ -164,30 +165,19 @@ public class ApnEditor extends InstrumentedPreferenceActivity
mPort = (EditTextPreference) findPreference("apn_http_port"); mPort = (EditTextPreference) findPreference("apn_http_port");
mUser = (EditTextPreference) findPreference("apn_user"); mUser = (EditTextPreference) findPreference("apn_user");
mServer = (EditTextPreference) findPreference("apn_server"); mServer = (EditTextPreference) findPreference("apn_server");
mPassword = (EditTextPreference) findPreference("apn_password"); mPassword = (EditTextPreference) findPreference(KEY_PASSWORD);
mMmsProxy = (EditTextPreference) findPreference("apn_mms_proxy"); mMmsProxy = (EditTextPreference) findPreference("apn_mms_proxy");
mMmsPort = (EditTextPreference) findPreference("apn_mms_port"); mMmsPort = (EditTextPreference) findPreference("apn_mms_port");
mMmsc = (EditTextPreference) findPreference("apn_mmsc"); mMmsc = (EditTextPreference) findPreference("apn_mmsc");
mMcc = (EditTextPreference) findPreference("apn_mcc"); mMcc = (EditTextPreference) findPreference("apn_mcc");
mMnc = (EditTextPreference) findPreference("apn_mnc"); mMnc = (EditTextPreference) findPreference("apn_mnc");
mApnType = (EditTextPreference) findPreference("apn_type"); mApnType = (EditTextPreference) findPreference("apn_type");
mAuthType = (ListPreference) findPreference(KEY_AUTH_TYPE); mAuthType = (ListPreference) findPreference(KEY_AUTH_TYPE);
mAuthType.setOnPreferenceChangeListener(this);
mProtocol = (ListPreference) findPreference(KEY_PROTOCOL); mProtocol = (ListPreference) findPreference(KEY_PROTOCOL);
mProtocol.setOnPreferenceChangeListener(this);
mRoamingProtocol = (ListPreference) findPreference(KEY_ROAMING_PROTOCOL); mRoamingProtocol = (ListPreference) findPreference(KEY_ROAMING_PROTOCOL);
mRoamingProtocol.setOnPreferenceChangeListener(this);
mCarrierEnabled = (SwitchPreference) findPreference(KEY_CARRIER_ENABLED); mCarrierEnabled = (SwitchPreference) findPreference(KEY_CARRIER_ENABLED);
mBearerMulti = (MultiSelectListPreference) findPreference(KEY_BEARER_MULTI); mBearerMulti = (MultiSelectListPreference) findPreference(KEY_BEARER_MULTI);
mBearerMulti.setOnPreferenceChangeListener(this);
mMvnoType = (ListPreference) findPreference(KEY_MVNO_TYPE); mMvnoType = (ListPreference) findPreference(KEY_MVNO_TYPE);
mMvnoType.setOnPreferenceChangeListener(this);
mMvnoMatchData = (EditTextPreference) findPreference("mvno_match_data"); mMvnoMatchData = (EditTextPreference) findPreference("mvno_match_data");
mRes = getResources(); mRes = getResources();
@@ -385,8 +375,7 @@ public class ApnEditor extends InstrumentedPreferenceActivity
mAuthType.setSummary(sNotSet); mAuthType.setSummary(sNotSet);
} }
mProtocol.setSummary( mProtocol.setSummary(checkNull(protocolDescription(mProtocol.getValue(), mProtocol)));
checkNull(protocolDescription(mProtocol.getValue(), mProtocol)));
mRoamingProtocol.setSummary( mRoamingProtocol.setSummary(
checkNull(protocolDescription(mRoamingProtocol.getValue(), mRoamingProtocol))); checkNull(protocolDescription(mRoamingProtocol.getValue(), mRoamingProtocol)));
mBearerMulti.setSummary( mBearerMulti.setSummary(
@@ -528,10 +517,9 @@ public class ApnEditor extends InstrumentedPreferenceActivity
} }
mMvnoType.setValue((String) newValue); mMvnoType.setValue((String) newValue);
mMvnoType.setSummary(mvno); mMvnoType.setSummary(mvno);
} } else if (KEY_PASSWORD.equals(key)) {
if (preference.equals(mPassword)) { mPassword.setSummary(starify(newValue != null ? String.valueOf(newValue) : ""));
preference.setSummary(starify(newValue != null ? String.valueOf(newValue) : "")); } else if (KEY_CARRIER_ENABLED.equals(key)) {
} else if (preference.equals(mCarrierEnabled) || preference.equals(mBearerMulti)) {
// do nothing // do nothing
} else { } else {
preference.setSummary(checkNull(newValue != null ? String.valueOf(newValue) : null)); preference.setSummary(checkNull(newValue != null ? String.valueOf(newValue) : null));