RomkaZVO/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/FWGS/xash3d-fwgs.git synced 2026-08-07 21:10:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

android: add adaptive icons for 26. Fix references to icons.

Browse Source
This commit is contained in:
Alibek Omarov
2019-12-01 01:27:21 +03:00
parent e72b89a88b
commit c22c227108
21 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/src/su/xash/engine/FPicker.java
View File

@@ -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 ));
}
}

2
android/src/su/xash/engine/ShortcutActivity.java
View File

@@ -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

2
android/src/su/xash/engine/XashActivity.java
View File

@@ -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() );

1
android/src/su/xash/engine/XashTutorialActivity.java
View File

@@ -134,7 +134,6 @@ public class XashTutorialActivity extends Activity implements View.OnClickListen
prev.setOnClickListener(this);
}
public void notifyIndicator() {
if (indicatorLayout.getChildCount() > 0)
indicatorLayout.removeAllViews();