aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain
diff options
context:
space:
mode:
authorNikhil Peter Raj <nikhilpeter93@gmail.com>2014-02-25 22:45:29 +0530
committerNikhil Peter Raj <nikhilpeter93@gmail.com>2014-02-25 22:45:29 +0530
commitfc06f678c5155b06ef9d6ab320062c8ce4310ff5 (patch)
tree9b607613f5fc6b08e9692395f820ee8276984f7a /OpenPGP-Keychain
parent6dabe9bf7f2c02acac96d50feb724427b9d6f9c5 (diff)
downloadopen-keychain-fc06f678c5155b06ef9d6ab320062c8ce4310ff5.tar.gz
open-keychain-fc06f678c5155b06ef9d6ab320062c8ce4310ff5.tar.bz2
open-keychain-fc06f678c5155b06ef9d6ab320062c8ce4310ff5.zip
Fix for #266
-Extra: Added the appropriate images to drawable folder from Android SDK source, can be used as alternative if required.
Diffstat (limited to 'OpenPGP-Keychain')
-rw-r--r--OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteFileDialogFragment.java3
-rw-r--r--OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteKeyDialogFragment.java2
-rw-r--r--OpenPGP-Keychain/src/main/res/drawable-hdpi/Thumbs.dbbin0 -> 4608 bytes
-rw-r--r--OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_dialog_alert_holo_light.pngbin0 -> 1018 bytes
-rw-r--r--OpenPGP-Keychain/src/main/res/drawable-mdpi/Thumbs.dbbin0 -> 3584 bytes
-rw-r--r--OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_dialog_alert_holo_light.pngbin0 -> 770 bytes
-rw-r--r--OpenPGP-Keychain/src/main/res/drawable-xhdpi/Thumbs.dbbin0 -> 5120 bytes
-rw-r--r--OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_dialog_alert_holo_light.pngbin0 -> 1359 bytes
-rw-r--r--OpenPGP-Keychain/src/main/res/drawable-xxhdpi/Thumbs.dbbin0 -> 6144 bytes
-rw-r--r--OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_dialog_alert_holo_light.pngbin0 -> 1991 bytes
10 files changed, 3 insertions, 2 deletions
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteFileDialogFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteFileDialogFragment.java
index f7e41daf7..4f2c44675 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteFileDialogFragment.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteFileDialogFragment.java
@@ -61,7 +61,8 @@ public class DeleteFileDialogFragment extends DialogFragment {
AlertDialog.Builder alert = new AlertDialog.Builder(activity);
- alert.setIcon(android.R.drawable.ic_dialog_alert);
+
+ alert.setIconAttribute(android.R.attr.alertDialogIcon);
alert.setTitle(R.string.warning);
alert.setMessage(this.getString(R.string.file_delete_confirmation, deleteFile));
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteKeyDialogFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteKeyDialogFragment.java
index 3c44bff81..5b20ddf15 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteKeyDialogFragment.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteKeyDialogFragment.java
@@ -100,7 +100,7 @@ public class DeleteKeyDialogFragment extends DialogFragment {
builder.setMessage(R.string.key_deletion_confirmation_multi);
}
- builder.setIcon(android.R.drawable.ic_dialog_alert);
+ builder.setIconAttribute(android.R.attr.alertDialogIcon);
builder.setPositiveButton(R.string.btn_delete, new DialogInterface.OnClickListener() {
@Override
diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/Thumbs.db b/OpenPGP-Keychain/src/main/res/drawable-hdpi/Thumbs.db
new file mode 100644
index 000000000..37eba349e
--- /dev/null
+++ b/OpenPGP-Keychain/src/main/res/drawable-hdpi/Thumbs.db
Binary files differ
diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_dialog_alert_holo_light.png b/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_dialog_alert_holo_light.png
new file mode 100644
index 000000000..1374a53e5
--- /dev/null
+++ b/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_dialog_alert_holo_light.png
Binary files differ
diff --git a/OpenPGP-Keychain/src/main/res/drawable-mdpi/Thumbs.db b/OpenPGP-Keychain/src/main/res/drawable-mdpi/Thumbs.db
new file mode 100644
index 000000000..824007986
--- /dev/null
+++ b/OpenPGP-Keychain/src/main/res/drawable-mdpi/Thumbs.db
Binary files differ
diff --git a/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_dialog_alert_holo_light.png b/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_dialog_alert_holo_light.png
new file mode 100644
index 000000000..9e7f0bd5f
--- /dev/null
+++ b/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_dialog_alert_holo_light.png
Binary files differ
diff --git a/OpenPGP-Keychain/src/main/res/drawable-xhdpi/Thumbs.db b/OpenPGP-Keychain/src/main/res/drawable-xhdpi/Thumbs.db
new file mode 100644
index 000000000..e82c912ed
--- /dev/null
+++ b/OpenPGP-Keychain/src/main/res/drawable-xhdpi/Thumbs.db
Binary files differ
diff --git a/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_dialog_alert_holo_light.png b/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_dialog_alert_holo_light.png
new file mode 100644
index 000000000..a99f0621c
--- /dev/null
+++ b/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_dialog_alert_holo_light.png
Binary files differ
diff --git a/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/Thumbs.db b/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/Thumbs.db
new file mode 100644
index 000000000..3375b7b80
--- /dev/null
+++ b/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/Thumbs.db
Binary files differ
diff --git a/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_dialog_alert_holo_light.png b/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_dialog_alert_holo_light.png
new file mode 100644
index 000000000..24ec28c2e
--- /dev/null
+++ b/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_dialog_alert_holo_light.png
Binary files differ