diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-02-25 20:25:09 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-02-25 20:25:09 +0100 |
commit | 5f669fa813da02017333f571f793c0513bcf80ca (patch) | |
tree | 83d221d0abbb8fd27173a126ccd12858f0278635 | |
parent | 6dabe9bf7f2c02acac96d50feb724427b9d6f9c5 (diff) | |
parent | fa6ea57121f86f9e898bd4a40b3306432e93b6b1 (diff) | |
download | open-keychain-5f669fa813da02017333f571f793c0513bcf80ca.tar.gz open-keychain-5f669fa813da02017333f571f793c0513bcf80ca.tar.bz2 open-keychain-5f669fa813da02017333f571f793c0513bcf80ca.zip |
Merge pull request #303 from hav3n/branch-fix-icon
Fix for #266
-rw-r--r-- | .gitignore | 3 | ||||
-rw-r--r-- | OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteFileDialogFragment.java | 3 | ||||
-rw-r--r-- | OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteKeyDialogFragment.java | 2 | ||||
-rw-r--r-- | OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_dialog_alert_holo_light.png | bin | 0 -> 1018 bytes | |||
-rw-r--r-- | OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_dialog_alert_holo_light.png | bin | 0 -> 770 bytes | |||
-rw-r--r-- | OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_dialog_alert_holo_light.png | bin | 0 -> 1359 bytes | |||
-rw-r--r-- | OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_dialog_alert_holo_light.png | bin | 0 -> 1991 bytes |
7 files changed, 6 insertions, 2 deletions
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/java/org/sufficientlysecure/keychain/ui/dialog/DeleteFileDialogFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteFileDialogFragment.java index f7e41daf7..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 @@ -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.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 3c44bff81..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.setIcon(android.R.drawable.ic_dialog_alert); + builder.setIcon(R.drawable.ic_dialog_alert_holo_light); builder.setPositiveButton(R.string.btn_delete, new DialogInterface.OnClickListener() { @Override 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 Binary files differnew file mode 100644 index 000000000..1374a53e5 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_dialog_alert_holo_light.png 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 Binary files differnew file mode 100644 index 000000000..9e7f0bd5f --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_dialog_alert_holo_light.png 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 Binary files differnew file mode 100644 index 000000000..a99f0621c --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_dialog_alert_holo_light.png 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 Binary files differnew file mode 100644 index 000000000..24ec28c2e --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_dialog_alert_holo_light.png |