From b4ead9c0ac263724e1fb87b622ac21fba91f42d4 Mon Sep 17 00:00:00 2001 From: mittorn Date: Fri, 4 Sep 2015 19:38:05 +0700 Subject: [PATCH] try icon.png first --- res/layout/activity_launcher.xml | 2 -- src/in/celest/xash3d/ShortcutActivity.java | 14 +++++++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/res/layout/activity_launcher.xml b/res/layout/activity_launcher.xml index d5f9749c..7f218354 100644 --- a/res/layout/activity_launcher.xml +++ b/res/layout/activity_launcher.xml @@ -6,8 +6,6 @@ android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin" android:paddingRight="@dimen/activity_horizontal_margin" - android:paddingTop="@dimen/activity_vertical_margin" - android:paddingBottom="@dimen/activity_vertical_margin" android:orientation="vertical" tools:context="in.celest.xash3d.LauncherActivity" android:id="@+id/layout_shortcut"> diff --git a/src/in/celest/xash3d/ShortcutActivity.java b/src/in/celest/xash3d/ShortcutActivity.java index 6b74fcc6..2de22967 100644 --- a/src/in/celest/xash3d/ShortcutActivity.java +++ b/src/in/celest/xash3d/ShortcutActivity.java @@ -34,9 +34,18 @@ public class ShortcutActivity extends Activity Intent wrapIntent = new Intent(); wrapIntent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, intent); wrapIntent.putExtra(Intent.EXTRA_SHORTCUT_NAME, name.getText().toString()); - Bitmap icon; + Bitmap icon = null; // Try find icon + int size = (int) getResources().getDimension(android.R.dimen.app_icon_size); + String gamedirstring = getSharedPreferences("engine", 0).getString("basedir","/sdcard/xash/")+(gamedir.length()!=0?gamedir.getText().toString():"valve"); try + { + icon = Bitmap.createScaledBitmap(BitmapFactory.decodeFile(gamedirstring+"/icon.png"), size, size, false); + } + catch(Exception e) + { + } + if(icon == null) try { FilenameFilter icoFilter = new FilenameFilter() { public boolean accept(File dir, String name) { @@ -46,10 +55,9 @@ public class ShortcutActivity extends Activity return false; } }; - String gamedirstring = getSharedPreferences("engine", 0).getString("basedir","/sdcard/xash/")+(gamedir.length()!=0?gamedir.getText().toString():"valve"); + File gamedirfile = new File(gamedirstring); String files[] = gamedirfile.list(icoFilter); - int size = (int) getResources().getDimension(android.R.dimen.app_icon_size); icon = Bitmap.createScaledBitmap(BitmapFactory.decodeFile(gamedirstring+"/"+files[0]), size, size, false); } catch(Exception e)