From d6d9dfb8f8205f773940cb3fcde0b3c18abef3be Mon Sep 17 00:00:00 2001
From: Dmitry Donskoy <donskdmitry@mail.ru>
Date: Mon, 13 May 2019 18:57:34 +0300
Subject: [PATCH] [android] Moved content to mipmap

---
 android/AndroidManifest.xml                         |   2 +-
 android/res/layout/activity_download_resources.xml  |   6 +++---
 android/res/layout/fragment_google_plus_dialog.xml  |   4 ++--
 .../{drawable-hdpi => mipmap-hdpi}/ic_launcher.png  | Bin
 .../{drawable-mdpi => mipmap-mdpi}/ic_launcher.png  | Bin
 .../{drawable-v26 => mipmap-v26}/ic_launcher.xml    |   0
 .../ic_launcher.png                                 | Bin
 .../ic_launcher.png                                 | Bin
 .../ic_launcher.png                                 | Bin
 9 files changed, 6 insertions(+), 6 deletions(-)
 rename android/res/{drawable-hdpi => mipmap-hdpi}/ic_launcher.png (100%)
 rename android/res/{drawable-mdpi => mipmap-mdpi}/ic_launcher.png (100%)
 rename android/res/{drawable-v26 => mipmap-v26}/ic_launcher.xml (100%)
 rename android/res/{drawable-xhdpi => mipmap-xhdpi}/ic_launcher.png (100%)
 rename android/res/{drawable-xxhdpi => mipmap-xxhdpi}/ic_launcher.png (100%)
 rename android/res/{drawable-xxxhdpi => mipmap-xxxhdpi}/ic_launcher.png (100%)

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 78be8253a2..194b7cbb36 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -59,7 +59,7 @@
   <application
       android:name=".MwmApplication"
       android:allowBackup="true"
-      android:icon="@drawable/ic_launcher"
+      android:icon="@mipmap/ic_launcher"
       android:label="@string/app_name"
       android:theme="@style/MwmTheme"
       android:supportsRtl="false"
diff --git a/android/res/layout/activity_download_resources.xml b/android/res/layout/activity_download_resources.xml
index e0460ba76e..92dc85de47 100644
--- a/android/res/layout/activity_download_resources.xml
+++ b/android/res/layout/activity_download_resources.xml
@@ -16,9 +16,9 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_marginTop="@dimen/margin_base_plus"
-      android:drawableLeft="@drawable/ic_launcher"
+      android:drawableLeft="@mipmap/ic_launcher"
       android:drawablePadding="@dimen/margin_base"
-      android:drawableStart="@drawable/ic_launcher"
+      android:drawableStart="@mipmap/ic_launcher"
       android:padding="@dimen/margin_half"
       android:textAppearance="@style/MwmTextAppearance.Body2"
       tools:text="@string/download_resources"/>
@@ -60,4 +60,4 @@
       android:visibility="gone"/>
   </LinearLayout>
 
-</ScrollView>
\ No newline at end of file
+</ScrollView>
diff --git a/android/res/layout/fragment_google_plus_dialog.xml b/android/res/layout/fragment_google_plus_dialog.xml
index 078b476ba3..a8197da752 100644
--- a/android/res/layout/fragment_google_plus_dialog.xml
+++ b/android/res/layout/fragment_google_plus_dialog.xml
@@ -9,7 +9,7 @@
     android:layout_height="wrap_content"
     android:layout_gravity="center_horizontal"
     android:padding="@dimen/margin_base"
-    android:src="@drawable/ic_launcher"/>
+    android:src="@mipmap/ic_launcher"/>
 
   <TextView
     style="@style/MwmWidget.TextView"
@@ -41,4 +41,4 @@
     android:layout_margin="@dimen/margin_half"
     plus:annotation="inline"
     plus:size="normal"/>
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/android/res/drawable-hdpi/ic_launcher.png b/android/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from android/res/drawable-hdpi/ic_launcher.png
rename to android/res/mipmap-hdpi/ic_launcher.png
diff --git a/android/res/drawable-mdpi/ic_launcher.png b/android/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from android/res/drawable-mdpi/ic_launcher.png
rename to android/res/mipmap-mdpi/ic_launcher.png
diff --git a/android/res/drawable-v26/ic_launcher.xml b/android/res/mipmap-v26/ic_launcher.xml
similarity index 100%
rename from android/res/drawable-v26/ic_launcher.xml
rename to android/res/mipmap-v26/ic_launcher.xml
diff --git a/android/res/drawable-xhdpi/ic_launcher.png b/android/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from android/res/drawable-xhdpi/ic_launcher.png
rename to android/res/mipmap-xhdpi/ic_launcher.png
diff --git a/android/res/drawable-xxhdpi/ic_launcher.png b/android/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from android/res/drawable-xxhdpi/ic_launcher.png
rename to android/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/android/res/drawable-xxxhdpi/ic_launcher.png b/android/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from android/res/drawable-xxxhdpi/ic_launcher.png
rename to android/res/mipmap-xxxhdpi/ic_launcher.png