diff options
author | Matthias <matthias.bosc@gmail.com> | 2013-06-05 23:00:57 +0200 |
---|---|---|
committer | Matthias <matthias.bosc@gmail.com> | 2013-06-10 09:52:43 +0200 |
commit | f931c04d5080745f7053242537ba76911de03b2a (patch) | |
tree | 8b5316b73dc9bed8ff859d99a97cb5fdc105495d | |
parent | 6752d08e59b3b27b96ffc9c4f5ebe8c36b03b3ea (diff) | |
download | packages_apps_Settings-f931c04d5080745f7053242537ba76911de03b2a.zip packages_apps_Settings-f931c04d5080745f7053242537ba76911de03b2a.tar.gz packages_apps_Settings-f931c04d5080745f7053242537ba76911de03b2a.tar.bz2 |
Settings - add an AlertDialog before to delete APN to avoid fails
patch 1: fix blank space
patch 2: remove FR translation and change NegativeButton string
patch 3: improve the NegativeButton (thank you, David)
patch 4: remove create()
Change-Id: I3361d4160a7e1c4eaee094f08c7d212f71e9e0e7
-rw-r--r-- | res/values/cm_strings.xml | 3 | ||||
-rw-r--r-- | src/com/android/settings/ApnEditor.java | 14 |
2 files changed, 15 insertions, 2 deletions
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml index 24d5863..a95a675 100644 --- a/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml @@ -945,4 +945,7 @@ two in order to insert additional control points. \'Remove\' deletes the selecte <string name="screen_off_animation_title">Screen-off animation</string> <string name="screen_off_animation_summary">Show the electron beam animation when the screen is turned off</string> + <!-- Delete apn confirmation dialog message --> + <string name="confirm_delete_apn">The APN will be deleted.</string> + </resources> diff --git a/src/com/android/settings/ApnEditor.java b/src/com/android/settings/ApnEditor.java index 30ba54e..2f2d0c1 100644 --- a/src/com/android/settings/ApnEditor.java +++ b/src/com/android/settings/ApnEditor.java @@ -22,6 +22,7 @@ import android.app.Dialog; import android.content.ContentUris; import android.content.ContentValues; import android.content.CursorLoader; +import android.content.DialogInterface; import android.content.Intent; import android.content.SharedPreferences; import android.content.res.Resources; @@ -548,8 +549,17 @@ public class ApnEditor extends SettingsPreferenceFragment } private void deleteApn() { - getContentResolver().delete(mUri, null, null); - finish(); + new AlertDialog.Builder(getActivity()) + .setMessage(R.string.confirm_delete_apn) + .setCancelable(true) + .setPositiveButton(R.string.delete,new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog,int id) { + getContentResolver().delete(mUri, null, null); + finish(); + } + }) + .setNegativeButton(R.string.cancel, null) + .show(); } private String starify(String value) { |