From fc06f678c5155b06ef9d6ab320062c8ce4310ff5 Mon Sep 17 00:00:00 2001 From: Nikhil Peter Raj Date: Tue, 25 Feb 2014 22:45:29 +0530 Subject: Fix for #266 -Extra: Added the appropriate images to drawable folder from Android SDK source, can be used as alternative if required. --- .../keychain/ui/dialog/DeleteFileDialogFragment.java | 3 ++- .../keychain/ui/dialog/DeleteKeyDialogFragment.java | 2 +- OpenPGP-Keychain/src/main/res/drawable-hdpi/Thumbs.db | Bin 0 -> 4608 bytes .../res/drawable-hdpi/ic_dialog_alert_holo_light.png | Bin 0 -> 1018 bytes OpenPGP-Keychain/src/main/res/drawable-mdpi/Thumbs.db | Bin 0 -> 3584 bytes .../res/drawable-mdpi/ic_dialog_alert_holo_light.png | Bin 0 -> 770 bytes OpenPGP-Keychain/src/main/res/drawable-xhdpi/Thumbs.db | Bin 0 -> 5120 bytes .../res/drawable-xhdpi/ic_dialog_alert_holo_light.png | Bin 0 -> 1359 bytes OpenPGP-Keychain/src/main/res/drawable-xxhdpi/Thumbs.db | Bin 0 -> 6144 bytes .../res/drawable-xxhdpi/ic_dialog_alert_holo_light.png | Bin 0 -> 1991 bytes 10 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 OpenPGP-Keychain/src/main/res/drawable-hdpi/Thumbs.db create mode 100644 OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_dialog_alert_holo_light.png create mode 100644 OpenPGP-Keychain/src/main/res/drawable-mdpi/Thumbs.db create mode 100644 OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_dialog_alert_holo_light.png create mode 100644 OpenPGP-Keychain/src/main/res/drawable-xhdpi/Thumbs.db create mode 100644 OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_dialog_alert_holo_light.png create mode 100644 OpenPGP-Keychain/src/main/res/drawable-xxhdpi/Thumbs.db create mode 100644 OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_dialog_alert_holo_light.png 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 Binary files /dev/null and b/OpenPGP-Keychain/src/main/res/drawable-hdpi/Thumbs.db 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 Binary files /dev/null and b/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_dialog_alert_holo_light.png 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 Binary files /dev/null and b/OpenPGP-Keychain/src/main/res/drawable-mdpi/Thumbs.db 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 Binary files /dev/null and b/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_dialog_alert_holo_light.png 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 Binary files /dev/null and b/OpenPGP-Keychain/src/main/res/drawable-xhdpi/Thumbs.db 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 Binary files /dev/null and b/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_dialog_alert_holo_light.png 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 Binary files /dev/null and b/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/Thumbs.db 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 Binary files /dev/null and b/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_dialog_alert_holo_light.png differ -- cgit v1.2.3 From c77aff6fc2ee810531efc268b5b3003f3ac8a89a Mon Sep 17 00:00:00 2001 From: Nikhil Peter Raj Date: Tue, 25 Feb 2014 23:43:59 +0530 Subject: Removed Thumbs.db,added to gitignore --- .gitignore | 3 +++ OpenPGP-Keychain/src/main/res/drawable-hdpi/Thumbs.db | Bin 4608 -> 0 bytes OpenPGP-Keychain/src/main/res/drawable-mdpi/Thumbs.db | Bin 3584 -> 0 bytes OpenPGP-Keychain/src/main/res/drawable-xhdpi/Thumbs.db | Bin 5120 -> 0 bytes OpenPGP-Keychain/src/main/res/drawable-xxhdpi/Thumbs.db | Bin 6144 -> 0 bytes 5 files changed, 3 insertions(+) delete mode 100644 OpenPGP-Keychain/src/main/res/drawable-hdpi/Thumbs.db delete mode 100644 OpenPGP-Keychain/src/main/res/drawable-mdpi/Thumbs.db delete mode 100644 OpenPGP-Keychain/src/main/res/drawable-xhdpi/Thumbs.db delete mode 100644 OpenPGP-Keychain/src/main/res/drawable-xxhdpi/Thumbs.db diff --git a/.gitignore b/.gitignore index 71c11b159..c4f2c8ad0 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,6 @@ pom.xml.* #IntelliJ IDEA .idea *.iml + +#OS Specific +[Tt]humbs.db diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/Thumbs.db b/OpenPGP-Keychain/src/main/res/drawable-hdpi/Thumbs.db deleted file mode 100644 index 37eba349e..000000000 Binary files a/OpenPGP-Keychain/src/main/res/drawable-hdpi/Thumbs.db and /dev/null differ diff --git a/OpenPGP-Keychain/src/main/res/drawable-mdpi/Thumbs.db b/OpenPGP-Keychain/src/main/res/drawable-mdpi/Thumbs.db deleted file mode 100644 index 824007986..000000000 Binary files a/OpenPGP-Keychain/src/main/res/drawable-mdpi/Thumbs.db and /dev/null differ diff --git a/OpenPGP-Keychain/src/main/res/drawable-xhdpi/Thumbs.db b/OpenPGP-Keychain/src/main/res/drawable-xhdpi/Thumbs.db deleted file mode 100644 index e82c912ed..000000000 Binary files a/OpenPGP-Keychain/src/main/res/drawable-xhdpi/Thumbs.db and /dev/null differ diff --git a/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/Thumbs.db b/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/Thumbs.db deleted file mode 100644 index 3375b7b80..000000000 Binary files a/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/Thumbs.db and /dev/null differ -- cgit v1.2.3 From fa6ea57121f86f9e898bd4a40b3306432e93b6b1 Mon Sep 17 00:00:00 2001 From: Nikhil Peter Raj Date: Wed, 26 Feb 2014 00:29:01 +0530 Subject: Final fix for #266 -Fix implemented using setIcon() as setIconAttribute() is not valid for API less than 11 --- .../sufficientlysecure/keychain/ui/dialog/DeleteFileDialogFragment.java | 2 +- .../sufficientlysecure/keychain/ui/dialog/DeleteKeyDialogFragment.java | 2 +- 2 files changed, 2 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 4f2c44675..a859bb045 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 @@ -62,7 +62,7 @@ public class DeleteFileDialogFragment extends DialogFragment { AlertDialog.Builder alert = new AlertDialog.Builder(activity); - alert.setIconAttribute(android.R.attr.alertDialogIcon); + alert.setIcon(R.drawable.ic_dialog_alert_holo_light); 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 5b20ddf15..8a8c6a1d6 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.setIconAttribute(android.R.attr.alertDialogIcon); + builder.setIcon(R.drawable.ic_dialog_alert_holo_light); builder.setPositiveButton(R.string.btn_delete, new DialogInterface.OnClickListener() { @Override -- cgit v1.2.3