From a246dc96756621ec43595ef7659e27f23d548f81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
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
 .../src/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
 .../src/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
 .../src/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
 OpenKeychain/src/main/res/drawable-xxxhdpi/icon.png   | Bin 20825 -> 0 bytes
 .../main/res/layout/import_keys_qr_code_fragment.xml  |   4 ++--
 22 files changed, 3 insertions(+), 3 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

(limited to 'OpenKeychain')

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">
         <activity
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_nfc.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_nfc.png
new file mode 100644
index 000000000..635633709
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_nfc.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_qr_code.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_qr_code.png
index e15a055db..1c65e5af8 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_qr_code.png and b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_qr_code.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_launcher.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_launcher.png
new file mode 100644
index 000000000..f5487599b
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_launcher.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/icon.png b/OpenKeychain/src/main/res/drawable-hdpi/icon.png
deleted file mode 100644
index f5487599b..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/icon.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-ldpi/ic_launcher.png b/OpenKeychain/src/main/res/drawable-ldpi/ic_launcher.png
new file mode 100644
index 000000000..7cd482bff
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-ldpi/ic_launcher.png differ
diff --git a/OpenKeychain/src/main/res/drawable-ldpi/icon.png b/OpenKeychain/src/main/res/drawable-ldpi/icon.png
deleted file mode 100644
index 7cd482bff..000000000
Binary files a/OpenKeychain/src/main/res/drawable-ldpi/icon.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_nfc.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_nfc.png
new file mode 100644
index 000000000..da5e267d0
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_nfc.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_qr_code.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_qr_code.png
index 1c65e5af8..570212461 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_qr_code.png and b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_qr_code.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_launcher.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_launcher.png
new file mode 100644
index 000000000..34f1420ac
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_launcher.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/icon.png b/OpenKeychain/src/main/res/drawable-mdpi/icon.png
deleted file mode 100644
index 34f1420ac..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/icon.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_nfc.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_nfc.png
new file mode 100644
index 000000000..ff569927c
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_nfc.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_qr_code.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_qr_code.png
index c56b128e4..ce8965396 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_qr_code.png and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_qr_code.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_launcher.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_launcher.png
new file mode 100644
index 000000000..32584f3ff
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_launcher.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/icon.png b/OpenKeychain/src/main/res/drawable-xhdpi/icon.png
deleted file mode 100644
index 32584f3ff..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/icon.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_nfc.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_nfc.png
new file mode 100644
index 000000000..1f96ce37b
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_nfc.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_qr_code.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_qr_code.png
index c718aee0b..c56b128e4 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_qr_code.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_qr_code.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_launcher.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_launcher.png
new file mode 100644
index 000000000..b2922309f
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_launcher.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/icon.png b/OpenKeychain/src/main/res/drawable-xxhdpi/icon.png
deleted file mode 100644
index b2922309f..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/icon.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_launcher.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_launcher.png
new file mode 100644
index 000000000..93ea6b0f5
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_launcher.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/icon.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/icon.png
deleted file mode 100644
index 93ea6b0f5..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxxhdpi/icon.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/layout/import_keys_qr_code_fragment.xml b/OpenKeychain/src/main/res/layout/import_keys_qr_code_fragment.xml
index 09a31b4a8..3f131b9ce 100644
--- a/OpenKeychain/src/main/res/layout/import_keys_qr_code_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_qr_code_fragment.xml
@@ -33,12 +33,12 @@
             android:layout_marginTop="8dp"
             android:background="?android:attr/listDivider" />
 
-        <Button
+        <ImageButton
             android:id="@+id/import_nfc_button"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:padding="8dp"
-            android:text="NFC?"
+            android:src="@drawable/ic_action_nfc"
             android:layout_gravity="center_vertical"
             style="@style/SelectableItem" />
 
-- 
cgit v1.2.3