diff options
author | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-29 09:28:35 -0400 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-29 09:28:35 -0400 |
commit | dd45a47bde9cdb9c27cb3ac3529a34f9789782ec (patch) | |
tree | 17432fca3229e3f0edaefda158025358f228d468 /src/com | |
parent | 17fcd476643e27943f548415e49e1be7d8e74ac1 (diff) | |
parent | 4d31288fe30b2e8f2e0a5ff54b402912fd830df1 (diff) | |
download | packages_apps_settings-dd45a47bde9cdb9c27cb3ac3529a34f9789782ec.zip packages_apps_settings-dd45a47bde9cdb9c27cb3ac3529a34f9789782ec.tar.gz packages_apps_settings-dd45a47bde9cdb9c27cb3ac3529a34f9789782ec.tar.bz2 |
Merge change I4d31288f into eclair
* changes:
Fix for 1974140. Delete entry if not valid on hitting home.
Diffstat (limited to 'src/com')
-rw-r--r-- | src/com/android/settings/ApnEditor.java | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/src/com/android/settings/ApnEditor.java b/src/com/android/settings/ApnEditor.java index 0e7ab5e..62856d1 100644 --- a/src/com/android/settings/ApnEditor.java +++ b/src/com/android/settings/ApnEditor.java @@ -150,7 +150,7 @@ public class ApnEditor extends PreferenceActivity if (action.equals(Intent.ACTION_EDIT)) { mUri = intent.getData(); } else if (action.equals(Intent.ACTION_INSERT)) { - if (mFirstTime) { + if (mFirstTime || icicle.getInt(SAVED_POS) == 0) { mUri = getContentResolver().insert(intent.getData(), new ContentValues()); } else { mUri = ContentUris.withAppendedId(Telephony.Carriers.CONTENT_URI, @@ -185,12 +185,14 @@ public class ApnEditor extends PreferenceActivity @Override public void onResume() { super.onResume(); - getPreferenceScreen().getSharedPreferences().registerOnSharedPreferenceChangeListener(this); + getPreferenceScreen().getSharedPreferences() + .registerOnSharedPreferenceChangeListener(this); } @Override public void onPause() { - getPreferenceScreen().getSharedPreferences().unregisterOnSharedPreferenceChangeListener(this); + getPreferenceScreen().getSharedPreferences() + .unregisterOnSharedPreferenceChangeListener(this); super.onPause(); } @@ -328,8 +330,9 @@ public class ApnEditor extends PreferenceActivity @Override protected void onSaveInstanceState(Bundle icicle) { super.onSaveInstanceState(icicle); - validateAndSave(true); - icicle.putInt(SAVED_POS, mCursor.getInt(ID_INDEX)); + if (validateAndSave(true)) { + icicle.putInt(SAVED_POS, mCursor.getInt(ID_INDEX)); + } } /** @@ -366,9 +369,18 @@ public class ApnEditor extends PreferenceActivity return false; } + // If it's a new APN and a name or apn haven't been entered, then erase the entry + if (force && mNewApn && name.length() < 1 && apn.length() < 1) { + getContentResolver().delete(mUri, null, null); + return false; + } + ContentValues values = new ContentValues(); - values.put(Telephony.Carriers.NAME, name); + // Add a dummy name "Untitled", if the user exits the screen without adding a name but + // entered other information worth keeping. + values.put(Telephony.Carriers.NAME, + name.length() < 1 ? getResources().getString(R.string.untitled_apn) : name); values.put(Telephony.Carriers.APN, apn); values.put(Telephony.Carriers.PROXY, checkNotSet(mProxy.getText())); values.put(Telephony.Carriers.PORT, checkNotSet(mPort.getText())); |