aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
diff options
context:
space:
mode:
authorKaladin Light <0.kaladin@gmail.com>2015-09-03 13:25:09 -0400
committerKaladin Light <0.kaladin@gmail.com>2015-09-03 13:25:09 -0400
commitdd850e5c72db1601aef54f9f35e1a2b11ae719c5 (patch)
treeec1eec2e70092e3263807b04c24d5df943c73a1b /OpenKeychain/src/main/res
parent87f7fe65a8ddf9f9f2f9881c0f2ef8f5d0e8c9f1 (diff)
downloadopen-keychain-dd850e5c72db1601aef54f9f35e1a2b11ae719c5.tar.gz
open-keychain-dd850e5c72db1601aef54f9f35e1a2b11ae719c5.tar.bz2
open-keychain-dd850e5c72db1601aef54f9f35e1a2b11ae719c5.zip
Fixes open-keychain/open-keychain#1515
Move launcher icons to mipmap
Diffstat (limited to 'OpenKeychain/src/main/res')
-rw-r--r--OpenKeychain/src/main/res/layout/api_app_settings_activity.xml2
-rw-r--r--OpenKeychain/src/main/res/layout/api_app_settings_fragment.xml4
-rw-r--r--OpenKeychain/src/main/res/layout/api_apps_adapter_list_item.xml4
-rw-r--r--OpenKeychain/src/main/res/layout/help_about_fragment.xml2
-rw-r--r--OpenKeychain/src/main/res/layout/view_key_activity.xml4
-rw-r--r--OpenKeychain/src/main/res/mipmap-hdpi/ic_launcher.png (renamed from OpenKeychain/src/main/res/drawable-hdpi/ic_launcher.png)bin6885 -> 6885 bytes
-rw-r--r--OpenKeychain/src/main/res/mipmap-mdpi/ic_launcher.png (renamed from OpenKeychain/src/main/res/drawable-mdpi/ic_launcher.png)bin4641 -> 4641 bytes
-rw-r--r--OpenKeychain/src/main/res/mipmap-xhdpi/ic_launcher.png (renamed from OpenKeychain/src/main/res/drawable-xhdpi/ic_launcher.png)bin8916 -> 8916 bytes
-rw-r--r--OpenKeychain/src/main/res/mipmap-xxhdpi/ic_launcher.png (renamed from OpenKeychain/src/main/res/drawable-xxhdpi/ic_launcher.png)bin13548 -> 13548 bytes
-rw-r--r--OpenKeychain/src/main/res/mipmap-xxxhdpi/ic_launcher.png (renamed from OpenKeychain/src/main/res/drawable-xxxhdpi/ic_launcher.png)bin16742 -> 16742 bytes
-rw-r--r--OpenKeychain/src/main/res/xml/account_desc.xml2
11 files changed, 9 insertions, 9 deletions
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" />
<TextView
android:id="@+id/api_app_settings_app_name"
diff --git a/OpenKeychain/src/main/res/layout/api_app_settings_fragment.xml b/OpenKeychain/src/main/res/layout/api_app_settings_fragment.xml
index 20abb3965..c02b506af 100644
--- a/OpenKeychain/src/main/res/layout/api_app_settings_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/api_app_settings_fragment.xml
@@ -17,7 +17,7 @@
android:layout_height="48dp"
android:layout_alignParentTop="true"
android:layout_marginRight="6dp"
- android:src="@drawable/ic_launcher" />
+ android:src="@mipmap/ic_launcher" />
<TextView
android:id="@+id/api_app_settings_app_name"
@@ -65,4 +65,4 @@
</org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout>
-</LinearLayout> \ No newline at end of file
+</LinearLayout>
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" />
<ImageView
android:id="@+id/api_apps_adapter_install_icon"
@@ -34,4 +34,4 @@
android:layout_toLeftOf="@+id/api_apps_adapter_install_icon"
android:layout_toRightOf="@+id/api_apps_adapter_item_icon" />
-</RelativeLayout> \ No newline at end of file
+</RelativeLayout>
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" />
</LinearLayout>
<LinearLayout
diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml
index 3913122bc..560180407 100644
--- a/OpenKeychain/src/main/res/layout/view_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml
@@ -54,7 +54,7 @@
android:fitsSystemWindows="true"
android:focusable="false"
android:scaleType="centerCrop"
- android:src="@drawable/ic_launcher" />
+ android:src="@mipmap/ic_launcher" />
<!-- text protection scrim -->
<View
@@ -222,4 +222,4 @@
app:layout_anchorGravity="bottom|right|end"
tools:visibility="visible" />
-</android.support.design.widget.CoordinatorLayout> \ No newline at end of file
+</android.support.design.widget.CoordinatorLayout>
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_launcher.png b/OpenKeychain/src/main/res/mipmap-hdpi/ic_launcher.png
index 6133816d2..6133816d2 100644
--- a/OpenKeychain/src/main/res/drawable-hdpi/ic_launcher.png
+++ b/OpenKeychain/src/main/res/mipmap-hdpi/ic_launcher.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_launcher.png b/OpenKeychain/src/main/res/mipmap-mdpi/ic_launcher.png
index d945a01de..d945a01de 100644
--- a/OpenKeychain/src/main/res/drawable-mdpi/ic_launcher.png
+++ b/OpenKeychain/src/main/res/mipmap-mdpi/ic_launcher.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_launcher.png b/OpenKeychain/src/main/res/mipmap-xhdpi/ic_launcher.png
index 825b18b38..825b18b38 100644
--- a/OpenKeychain/src/main/res/drawable-xhdpi/ic_launcher.png
+++ b/OpenKeychain/src/main/res/mipmap-xhdpi/ic_launcher.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_launcher.png b/OpenKeychain/src/main/res/mipmap-xxhdpi/ic_launcher.png
index 4809acc39..4809acc39 100644
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_launcher.png
+++ b/OpenKeychain/src/main/res/mipmap-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_launcher.png b/OpenKeychain/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index fab324e93..fab324e93 100644
--- a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_launcher.png
+++ b/OpenKeychain/src/main/res/mipmap-xxxhdpi/ic_launcher.png
Binary files 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 @@
<account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
android:accountPreferences="@xml/account_preferences"
android:accountType="@string/account_type"
- android:icon="@drawable/ic_launcher"
+ android:icon="@mipmap/ic_launcher"
android:label="@string/app_name" />