diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index 9af5f6fb..c7d32287 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -9,7 +9,8 @@ android:installLocation="auto"> diff --git a/android/res/layout/about.xml b/android/res/layout/about.xml index 4e415ded..4b492bb8 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="@drawable/ic_launcher" /> + android:src="@mipmap/ic_launcher" /> diff --git a/android/res/layout/notify.xml b/android/res/layout/notify.xml index 3675beee..e0080a41 100644 --- a/android/res/layout/notify.xml +++ b/android/res/layout/notify.xml @@ -5,7 +5,7 @@ android:orientation="horizontal"> + + + + diff --git a/android/res/mipmap-hdpi/ic_launcher.png b/android/res/mipmap-hdpi/ic_launcher.png index a870cf41..c44c54c9 100644 Binary files a/android/res/mipmap-hdpi/ic_launcher.png and b/android/res/mipmap-hdpi/ic_launcher.png differ diff --git a/android/res/mipmap-hdpi/ic_launcher_foreground.png b/android/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 00000000..6b74f4ab Binary files /dev/null and b/android/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/android/res/mipmap-mdpi/ic_launcher.png b/android/res/mipmap-mdpi/ic_launcher.png index bb485aa4..f1b9bdc4 100644 Binary files a/android/res/mipmap-mdpi/ic_launcher.png and b/android/res/mipmap-mdpi/ic_launcher.png differ diff --git a/android/res/mipmap-mdpi/ic_launcher_foreground.png b/android/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 00000000..7244c605 Binary files /dev/null and b/android/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/android/res/mipmap-xhdpi/ic_launcher.png b/android/res/mipmap-xhdpi/ic_launcher.png index 4979278e..642fea13 100644 Binary files a/android/res/mipmap-xhdpi/ic_launcher.png and b/android/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/android/res/mipmap-xhdpi/ic_launcher_foreground.png b/android/res/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 00000000..fa74343a Binary files /dev/null and b/android/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/android/res/mipmap-xxhdpi/ic_launcher.png b/android/res/mipmap-xxhdpi/ic_launcher.png index d0e7e143..6558a319 100644 Binary files a/android/res/mipmap-xxhdpi/ic_launcher.png and b/android/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/android/res/mipmap-xxhdpi/ic_launcher_foreground.png b/android/res/mipmap-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 00000000..a053ea7a Binary files /dev/null and b/android/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/android/res/mipmap-xxxhdpi/ic_launcher.png b/android/res/mipmap-xxxhdpi/ic_launcher.png index 72508438..929bf516 100644 Binary files a/android/res/mipmap-xxxhdpi/ic_launcher.png and b/android/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/android/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/android/res/mipmap-xxxhdpi/ic_launcher_foreground.png new file mode 100644 index 00000000..6bacb253 Binary files /dev/null and b/android/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/android/res/values/colors.xml b/android/res/values/colors.xml new file mode 100644 index 00000000..32992286 --- /dev/null +++ b/android/res/values/colors.xml @@ -0,0 +1,5 @@ + + + #f74843 + + diff --git a/android/src/su/xash/engine/FPicker.java b/android/src/su/xash/engine/FPicker.java index f4fc0ee5..893e0342 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.drawable.ic_launcher : R.drawable.folder )); + dir.add(new Item(ff.getName(), num_item, date_modify, ff.getAbsolutePath(), isXashDir ? R.mipmap.ic_launcher : R.drawable.folder )); } } diff --git a/android/src/su/xash/engine/ShortcutActivity.java b/android/src/su/xash/engine/ShortcutActivity.java index 57227e14..b46f61f9 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.drawable.ic_launcher); + icon = BitmapFactory.decodeResource(getResources(), R.mipmap.ic_launcher); } wrapIntent.putExtra(Intent.EXTRA_SHORTCUT_ICON, icon); if(getIntent().getAction() == "android.intent.action.CREATE_SHORTCUT" ) // Called from launcher diff --git a/android/src/su/xash/engine/XashActivity.java b/android/src/su/xash/engine/XashActivity.java index 9297cbb6..a99570e4 100644 --- a/android/src/su/xash/engine/XashActivity.java +++ b/android/src/su/xash/engine/XashActivity.java @@ -1072,7 +1072,7 @@ class EngineSurface extends SurfaceView implements SurfaceHolder.Callback, View. // Android may force only-landscape app to portait during lock // Just don't notify engine in that case - if( width > height || mEngThread == null ) + if( width > height ) XashActivity.onNativeResize( width, height ); XashActivity.nativeSetSurface( holder.getSurface() ); diff --git a/android/src/su/xash/engine/XashTutorialActivity.java b/android/src/su/xash/engine/XashTutorialActivity.java index 42ea2347..1bc07ad9 100644 --- a/android/src/su/xash/engine/XashTutorialActivity.java +++ b/android/src/su/xash/engine/XashTutorialActivity.java @@ -134,7 +134,6 @@ public class XashTutorialActivity extends Activity implements View.OnClickListen prev.setOnClickListener(this); } - public void notifyIndicator() { if (indicatorLayout.getChildCount() > 0) indicatorLayout.removeAllViews();