From dd850e5c72db1601aef54f9f35e1a2b11ae719c5 Mon Sep 17 00:00:00 2001
From: Kaladin Light <0.kaladin@gmail.com>
Date: Thu, 3 Sep 2015 13:25:09 -0400
Subject: Fixes open-keychain/open-keychain#1515 Move launcher icons to mipmap
---
OpenKeychain/src/main/res/drawable-hdpi/ic_launcher.png | Bin 6885 -> 0 bytes
OpenKeychain/src/main/res/drawable-mdpi/ic_launcher.png | Bin 4641 -> 0 bytes
.../src/main/res/drawable-xhdpi/ic_launcher.png | Bin 8916 -> 0 bytes
.../src/main/res/drawable-xxhdpi/ic_launcher.png | Bin 13548 -> 0 bytes
.../src/main/res/drawable-xxxhdpi/ic_launcher.png | Bin 16742 -> 0 bytes
.../src/main/res/layout/api_app_settings_activity.xml | 2 +-
.../src/main/res/layout/api_app_settings_fragment.xml | 4 ++--
.../src/main/res/layout/api_apps_adapter_list_item.xml | 4 ++--
.../src/main/res/layout/help_about_fragment.xml | 2 +-
OpenKeychain/src/main/res/layout/view_key_activity.xml | 4 ++--
OpenKeychain/src/main/res/mipmap-hdpi/ic_launcher.png | Bin 0 -> 6885 bytes
OpenKeychain/src/main/res/mipmap-mdpi/ic_launcher.png | Bin 0 -> 4641 bytes
OpenKeychain/src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 8916 bytes
OpenKeychain/src/main/res/mipmap-xxhdpi/ic_launcher.png | Bin 0 -> 13548 bytes
.../src/main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 0 -> 16742 bytes
OpenKeychain/src/main/res/xml/account_desc.xml | 2 +-
16 files changed, 9 insertions(+), 9 deletions(-)
delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_launcher.png
delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_launcher.png
delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_launcher.png
delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_launcher.png
delete mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_launcher.png
create mode 100644 OpenKeychain/src/main/res/mipmap-hdpi/ic_launcher.png
create mode 100644 OpenKeychain/src/main/res/mipmap-mdpi/ic_launcher.png
create mode 100644 OpenKeychain/src/main/res/mipmap-xhdpi/ic_launcher.png
create mode 100644 OpenKeychain/src/main/res/mipmap-xxhdpi/ic_launcher.png
create mode 100644 OpenKeychain/src/main/res/mipmap-xxxhdpi/ic_launcher.png
(limited to 'OpenKeychain/src/main/res')
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_launcher.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index 6133816d2..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_launcher.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_launcher.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index d945a01de..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_launcher.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_launcher.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100644
index 825b18b38..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_launcher.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_launcher.png
deleted file mode 100644
index 4809acc39..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_launcher.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
deleted file mode 100644
index fab324e93..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_launcher.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml b/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml
index 9557bf61e..5955fe8b5 100644
--- a/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml
+++ b/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml
@@ -46,7 +46,7 @@
android:id="@+id/api_app_settings_app_icon"
android:layout_width="48dp"
android:layout_height="48dp"
- android:src="@drawable/ic_launcher" />
+ android:src="@mipmap/ic_launcher" />
+ android:src="@mipmap/ic_launcher" />
-
\ No newline at end of file
+
diff --git a/OpenKeychain/src/main/res/layout/api_apps_adapter_list_item.xml b/OpenKeychain/src/main/res/layout/api_apps_adapter_list_item.xml
index 9166f958e..f6eafdbda 100644
--- a/OpenKeychain/src/main/res/layout/api_apps_adapter_list_item.xml
+++ b/OpenKeychain/src/main/res/layout/api_apps_adapter_list_item.xml
@@ -11,7 +11,7 @@
android:layout_height="48dp"
android:layout_marginLeft="8dp"
android:layout_centerVertical="true"
- android:src="@drawable/ic_launcher" />
+ android:src="@mipmap/ic_launcher" />
-
\ No newline at end of file
+
diff --git a/OpenKeychain/src/main/res/layout/help_about_fragment.xml b/OpenKeychain/src/main/res/layout/help_about_fragment.xml
index dbcd97bfd..cbe1c3331 100644
--- a/OpenKeychain/src/main/res/layout/help_about_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/help_about_fragment.xml
@@ -32,7 +32,7 @@
android:layout_height="wrap_content"
android:layout_gravity="top"
android:layout_marginRight="10dp"
- android:src="@drawable/ic_launcher" />
+ android:src="@mipmap/ic_launcher" />
+ android:src="@mipmap/ic_launcher" />
-
\ No newline at end of file
+
diff --git a/OpenKeychain/src/main/res/mipmap-hdpi/ic_launcher.png b/OpenKeychain/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 000000000..6133816d2
Binary files /dev/null and b/OpenKeychain/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/OpenKeychain/src/main/res/mipmap-mdpi/ic_launcher.png b/OpenKeychain/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 000000000..d945a01de
Binary files /dev/null and b/OpenKeychain/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/OpenKeychain/src/main/res/mipmap-xhdpi/ic_launcher.png b/OpenKeychain/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 000000000..825b18b38
Binary files /dev/null and b/OpenKeychain/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/OpenKeychain/src/main/res/mipmap-xxhdpi/ic_launcher.png b/OpenKeychain/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 000000000..4809acc39
Binary files /dev/null and b/OpenKeychain/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/OpenKeychain/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/OpenKeychain/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 000000000..fab324e93
Binary files /dev/null and b/OpenKeychain/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/OpenKeychain/src/main/res/xml/account_desc.xml b/OpenKeychain/src/main/res/xml/account_desc.xml
index e04160c5c..942909dbe 100644
--- a/OpenKeychain/src/main/res/xml/account_desc.xml
+++ b/OpenKeychain/src/main/res/xml/account_desc.xml
@@ -2,5 +2,5 @@
--
cgit v1.2.3