From a246dc96756621ec43595ef7659e27f23d548f81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Wed, 18 Jun 2014 22:30:54 +0200 Subject: Fix new actionbar icon sizes, rename icon to ic_launcher following Android naming conventions --- OpenKeychain/src/main/AndroidManifest.xml | 2 +- .../src/main/res/drawable-hdpi/ic_action_nfc.png | Bin 0 -> 1660 bytes .../main/res/drawable-hdpi/ic_action_qr_code.png | Bin 2680 -> 2388 bytes .../src/main/res/drawable-hdpi/ic_launcher.png | Bin 0 -> 5093 bytes OpenKeychain/src/main/res/drawable-hdpi/icon.png | Bin 5093 -> 0 bytes .../src/main/res/drawable-ldpi/ic_launcher.png | Bin 0 -> 1967 bytes OpenKeychain/src/main/res/drawable-ldpi/icon.png | Bin 1967 -> 0 bytes .../src/main/res/drawable-mdpi/ic_action_nfc.png | Bin 0 -> 1147 bytes .../main/res/drawable-mdpi/ic_action_qr_code.png | Bin 2388 -> 1502 bytes .../src/main/res/drawable-mdpi/ic_launcher.png | Bin 0 -> 2896 bytes OpenKeychain/src/main/res/drawable-mdpi/icon.png | Bin 2896 -> 0 bytes .../src/main/res/drawable-xhdpi/ic_action_nfc.png | Bin 0 -> 2297 bytes .../main/res/drawable-xhdpi/ic_action_qr_code.png | Bin 3339 -> 2592 bytes .../src/main/res/drawable-xhdpi/ic_launcher.png | Bin 0 -> 7870 bytes OpenKeychain/src/main/res/drawable-xhdpi/icon.png | Bin 7870 -> 0 bytes .../src/main/res/drawable-xxhdpi/ic_action_nfc.png | Bin 0 -> 2378 bytes .../main/res/drawable-xxhdpi/ic_action_qr_code.png | Bin 3458 -> 3339 bytes .../src/main/res/drawable-xxhdpi/ic_launcher.png | Bin 0 -> 14153 bytes OpenKeychain/src/main/res/drawable-xxhdpi/icon.png | Bin 14153 -> 0 bytes .../src/main/res/drawable-xxxhdpi/ic_launcher.png | Bin 0 -> 20825 bytes .../src/main/res/drawable-xxxhdpi/icon.png | Bin 20825 -> 0 bytes .../res/layout/import_keys_qr_code_fragment.xml | 4 +- Resources/graphics/ic_action_nfc.svg | 61 + Resources/graphics/ic_action_nfc/NFC.png | Bin 0 -> 88038 bytes Resources/graphics/ic_action_qr_code.png | Bin 5377 -> 0 bytes .../graphics/ic_action_qr_code/ic_menu_qr_code.svg | 753 ++++ Resources/graphics/ic_launcher.png | Bin 0 -> 77995 bytes Resources/graphics/ic_launcher.svg | 3622 ++++++++++++++++++++ Resources/graphics/ic_launcher/AUTHORS | 21 + Resources/graphics/ic_launcher/COPYING | 48 + .../graphics/ic_launcher/kgpg_key2_kopete.svgz | Bin 0 -> 36830 bytes Resources/graphics/icon.png | Bin 77995 -> 0 bytes Resources/graphics/icon.svg | 3622 -------------------- Resources/graphics/icon/AUTHORS | 21 - Resources/graphics/icon/COPYING | 48 - Resources/graphics/icon/kgpg_key2_kopete.svgz | Bin 36830 -> 0 bytes Resources/graphics/update-drawables.sh | 46 + Resources/graphics/update-icon.sh | 32 - 38 files changed, 4554 insertions(+), 3726 deletions(-) create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_action_nfc.png create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_launcher.png delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/icon.png create mode 100644 OpenKeychain/src/main/res/drawable-ldpi/ic_launcher.png delete mode 100644 OpenKeychain/src/main/res/drawable-ldpi/icon.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_action_nfc.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_launcher.png delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/icon.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_action_nfc.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_launcher.png delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/icon.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_nfc.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_launcher.png delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/icon.png create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_launcher.png delete mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/icon.png create mode 100644 Resources/graphics/ic_action_nfc.svg create mode 100644 Resources/graphics/ic_action_nfc/NFC.png delete mode 100644 Resources/graphics/ic_action_qr_code.png create mode 100644 Resources/graphics/ic_action_qr_code/ic_menu_qr_code.svg create mode 100644 Resources/graphics/ic_launcher.png create mode 100644 Resources/graphics/ic_launcher.svg create mode 100644 Resources/graphics/ic_launcher/AUTHORS create mode 100644 Resources/graphics/ic_launcher/COPYING create mode 100644 Resources/graphics/ic_launcher/kgpg_key2_kopete.svgz delete mode 100644 Resources/graphics/icon.png delete mode 100644 Resources/graphics/icon.svg delete mode 100644 Resources/graphics/icon/AUTHORS delete mode 100644 Resources/graphics/icon/COPYING delete mode 100644 Resources/graphics/icon/kgpg_key2_kopete.svgz create mode 100755 Resources/graphics/update-drawables.sh delete mode 100755 Resources/graphics/update-icon.sh diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml index b3a4d5960..48677431c 100644 --- a/OpenKeychain/src/main/AndroidManifest.xml +++ b/OpenKeychain/src/main/AndroidManifest.xml @@ -65,7 +65,7 @@ android:name=".KeychainApplication" android:allowBackup="false" android:hardwareAccelerated="true" - android:icon="@drawable/icon" + android:icon="@drawable/ic_launcher" android:theme="@style/KeychainTheme" android:label="@string/app_name"> -