try icon.png first

This commit is contained in:
mittorn 2015-09-04 19:38:05 +07:00
parent 1b894336fc
commit b4ead9c0ac
2 changed files with 11 additions and 5 deletions

View file

@ -6,8 +6,6 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:paddingLeft="@dimen/activity_horizontal_margin" android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@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" android:orientation="vertical"
tools:context="in.celest.xash3d.LauncherActivity" tools:context="in.celest.xash3d.LauncherActivity"
android:id="@+id/layout_shortcut"> android:id="@+id/layout_shortcut">

View file

@ -34,9 +34,18 @@ public class ShortcutActivity extends Activity
Intent wrapIntent = new Intent(); Intent wrapIntent = new Intent();
wrapIntent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, intent); wrapIntent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, intent);
wrapIntent.putExtra(Intent.EXTRA_SHORTCUT_NAME, name.getText().toString()); wrapIntent.putExtra(Intent.EXTRA_SHORTCUT_NAME, name.getText().toString());
Bitmap icon; Bitmap icon = null;
// Try find icon // 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 try
{
icon = Bitmap.createScaledBitmap(BitmapFactory.decodeFile(gamedirstring+"/icon.png"), size, size, false);
}
catch(Exception e)
{
}
if(icon == null) try
{ {
FilenameFilter icoFilter = new FilenameFilter() { FilenameFilter icoFilter = new FilenameFilter() {
public boolean accept(File dir, String name) { public boolean accept(File dir, String name) {
@ -46,10 +55,9 @@ public class ShortcutActivity extends Activity
return false; return false;
} }
}; };
String gamedirstring = getSharedPreferences("engine", 0).getString("basedir","/sdcard/xash/")+(gamedir.length()!=0?gamedir.getText().toString():"valve");
File gamedirfile = new File(gamedirstring); File gamedirfile = new File(gamedirstring);
String files[] = gamedirfile.list(icoFilter); 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); icon = Bitmap.createScaledBitmap(BitmapFactory.decodeFile(gamedirstring+"/"+files[0]), size, size, false);
} }
catch(Exception e) catch(Exception e)