From ac0e9b633da534944568e12e6e661c6e82096bd7 Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Tue, 7 Jul 2020 07:26:25 +0700
Subject: [PATCH] mipmap does not work on 4.2-

---
 android/AndroidManifest.xml                      | 3 ++-
 android/res/layout/about.xml                     | 2 +-
 android/res/layout/activity_launcher.xml         | 3 ++-
 android/res/layout/notify.xml                    | 2 +-
 android/src/su/xash/engine/FPicker.java          | 2 +-
 android/src/su/xash/engine/ShortcutActivity.java | 2 +-
 6 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index c8212f42..9acab46b 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -9,7 +9,7 @@
 	android:installLocation="auto">
 
 	<application android:label="@string/app_name"
-		android:icon="@mipmap/ic_launcher"
+		android:icon="@drawable/ic_launcher"
 		android:roundIcon="@mipmap/ic_launcher"
 		android:allowBackup="false"
 		android:fullBackupOnly="false"
@@ -20,6 +20,7 @@
 		
 		<activity android:name="su.xash.engine.LauncherActivity"
 			android:label="@string/launcher_name"
+			android:icon="@mipmap/ic_launcher"
 			android:windowSoftInputMode="adjustResize"
 			android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize">
 			<intent-filter>
diff --git a/android/res/layout/about.xml b/android/res/layout/about.xml
index 4b492bb8..4e415ded 100644
--- a/android/res/layout/about.xml
+++ b/android/res/layout/about.xml
@@ -14,7 +14,7 @@
             android:layout_height="89dp"
             android:id="@+id/aboutIcon"
             android:layout_gravity="center_horizontal"
-            android:src="@mipmap/ic_launcher" />
+            android:src="@drawable/ic_launcher" />
 
         <TextView
             android:layout_width="wrap_content"
diff --git a/android/res/layout/activity_launcher.xml b/android/res/layout/activity_launcher.xml
index 6f328a63..a8ff5319 100644
--- a/android/res/layout/activity_launcher.xml
+++ b/android/res/layout/activity_launcher.xml
@@ -18,7 +18,8 @@
 			android:layout_width="wrap_content"
 			android:layout_height="match_parent"
 			android:layout_margin="2dp"
-			android:src="@mipmap/ic_launcher" />
+			android:src="@drawable/ic_launcher"
+			android:id="@+id/launcherIcon" />
 		<TextView
 			android:id="@+id/textView_tittle"
 			android:layout_width="fill_parent"
diff --git a/android/res/layout/notify.xml b/android/res/layout/notify.xml
index e0080a41..3675beee 100644
--- a/android/res/layout/notify.xml
+++ b/android/res/layout/notify.xml
@@ -5,7 +5,7 @@
 	android:orientation="horizontal">
 	<ImageView
 		android:id="@+id/status_image"
-		android:src="@mipmap/ic_launcher"
+		android:src="@drawable/ic_launcher"
 		android:layout_weight="0"
 		android:layout_gravity="center_vertical"
 		android:layout_width="48dp"
diff --git a/android/src/su/xash/engine/FPicker.java b/android/src/su/xash/engine/FPicker.java
index 893e0342..f4fc0ee5 100644
--- a/android/src/su/xash/engine/FPicker.java
+++ b/android/src/su/xash/engine/FPicker.java
@@ -114,7 +114,7 @@ public class FPicker extends Activity {
 					}
 					
 					String num_item = getResources().getQuantityString(R.plurals.item_plurals, buf, buf);
-					dir.add(new Item(ff.getName(), num_item, date_modify, ff.getAbsolutePath(), isXashDir ? R.mipmap.ic_launcher : R.drawable.folder ));
+					dir.add(new Item(ff.getName(), num_item, date_modify, ff.getAbsolutePath(), isXashDir ? R.drawable.ic_launcher : R.drawable.folder ));
 				}
             }
             
diff --git a/android/src/su/xash/engine/ShortcutActivity.java b/android/src/su/xash/engine/ShortcutActivity.java
index b46f61f9..57227e14 100644
--- a/android/src/su/xash/engine/ShortcutActivity.java
+++ b/android/src/su/xash/engine/ShortcutActivity.java
@@ -108,7 +108,7 @@ public class ShortcutActivity extends Activity
 		catch(Exception e)
 		{
 			// Android may not support ico loading, so fallback if something going wrong
-			icon = BitmapFactory.decodeResource(getResources(), R.mipmap.ic_launcher);
+			icon = BitmapFactory.decodeResource(getResources(), R.drawable.ic_launcher);
 		}
 		wrapIntent.putExtra(Intent.EXTRA_SHORTCUT_ICON, icon);
 		if(getIntent().getAction() == "android.intent.action.CREATE_SHORTCUT" ) // Called from launcher