android: add adaptive icons for 26. Fix references to icons.
@ -9,7 +9,8 @@
|
||||
android:installLocation="auto">
|
||||
|
||||
<application android:label="@string/app_name"
|
||||
android:icon="@drawable/ic_launcher"
|
||||
android:icon="@mipmap/ic_launcher"
|
||||
android:roundIcon="@mipmap/ic_launcher_round"
|
||||
android:allowBackup="true"
|
||||
android:debuggable="false"
|
||||
android:hardwareAccelerated="true">
|
||||
|
@ -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" />
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
|
@ -17,7 +17,7 @@
|
||||
android:text="@string/launcher_name"
|
||||
android:textAppearance="?android:attr/textAppearanceMedium"
|
||||
android:textSize="25sp"
|
||||
android:drawableLeft="@drawable/ic_launcher"
|
||||
android:drawableLeft="@mipmap/ic_launcher"
|
||||
android:drawablePadding="10dp"
|
||||
android:singleLine="true"
|
||||
android:gravity="center_vertical" />
|
||||
|
@ -5,7 +5,7 @@
|
||||
android:orientation="horizontal">
|
||||
<ImageView
|
||||
android:id="@+id/status_image"
|
||||
android:src="@drawable/ic_launcher"
|
||||
android:src="@mipmap/ic_launcher"
|
||||
android:layout_weight="0"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:layout_width="48dp"
|
||||
|
@ -6,7 +6,7 @@
|
||||
android:background="#FFFFFF">
|
||||
<ImageView
|
||||
android:id="@+id/status_image_21"
|
||||
android:src="@drawable/ic_launcher"
|
||||
android:src="@mipmap/ic_launcher"
|
||||
android:layout_weight="0"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:layout_width="48dp"
|
||||
|
5
android/res/mipmap-anydpi-v26/ic_launcher_round.xml
Normal file
@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<background android:drawable="@color/sunset_orange" />
|
||||
<foreground android:drawable="@mipmap/ic_launcher_foreground" />
|
||||
</adaptive-icon>
|
Before Width: | Height: | Size: 4.3 KiB After Width: | Height: | Size: 12 KiB |
BIN
android/res/mipmap-hdpi/ic_launcher_foreground.png
Normal file
After Width: | Height: | Size: 3.0 KiB |
Before Width: | Height: | Size: 2.9 KiB After Width: | Height: | Size: 10 KiB |
BIN
android/res/mipmap-mdpi/ic_launcher_foreground.png
Normal file
After Width: | Height: | Size: 2.0 KiB |
Before Width: | Height: | Size: 5.7 KiB After Width: | Height: | Size: 13 KiB |
BIN
android/res/mipmap-xhdpi/ic_launcher_foreground.png
Normal file
After Width: | Height: | Size: 3.9 KiB |
Before Width: | Height: | Size: 8.5 KiB After Width: | Height: | Size: 16 KiB |
BIN
android/res/mipmap-xxhdpi/ic_launcher_foreground.png
Normal file
After Width: | Height: | Size: 5.8 KiB |
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 19 KiB |
BIN
android/res/mipmap-xxxhdpi/ic_launcher_foreground.png
Normal file
After Width: | Height: | Size: 7.9 KiB |
5
android/res/values/colors.xml
Normal file
@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<color name="sunset_orange">#f74843</color>
|
||||
</resources>
|
||||
|
@ -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 ));
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -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
|
||||
|
@ -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() );
|
||||
|
@ -134,7 +134,6 @@ public class XashTutorialActivity extends Activity implements View.OnClickListen
|
||||
prev.setOnClickListener(this);
|
||||
}
|
||||
|
||||
|
||||
public void notifyIndicator() {
|
||||
if (indicatorLayout.getChildCount() > 0)
|
||||
indicatorLayout.removeAllViews();
|
||||
|