From 2b65b715382932cf34475a8607bc33c1cc8a13a7 Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Fri, 4 Sep 2015 20:55:37 +0700
Subject: [PATCH] Allow start ShortcutActivity from launcher

---
 AndroidManifest.xml                        |  5 +++--
 res/layout/activity_launcher.xml           |  6 ++++++
 res/layout/activity_shortcut.xml           | 12 ++++++------
 res/values-ru/strings.xml                  |  1 +
 res/values/strings.xml                     |  3 ++-
 src/in/celest/xash3d/LauncherActivity.java |  6 ++++++
 src/in/celest/xash3d/ShortcutActivity.java | 19 +++++++++++++++++--
 test/AndroidManifest.xml                   |  3 ++-
 8 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2701406a..1da4a3cb 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -73,8 +73,9 @@
     <!-- OpenGL ES 1.1 -->
     <uses-feature android:glEsVersion="0x00010000" /> 
 
-    <!-- Allow writing to external storage -->
+    <!-- Permissions -->
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> 
-    <uses-permission android:name="android.permission.INTERNET" /> 
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
 </manifest> 
diff --git a/res/layout/activity_launcher.xml b/res/layout/activity_launcher.xml
index 7f218354..22d7c0e1 100644
--- a/res/layout/activity_launcher.xml
+++ b/res/layout/activity_launcher.xml
@@ -64,6 +64,12 @@
 				android:text="@string/about_button"
 				android:id="@+id/button"
 				android:onClick="aboutXash" />
+			<Button
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:text="@string/create_shortcut_button"
+				android:id="@+id/button"
+				android:onClick="createShortcut" />
 
 			<TextView
 				android:layout_width="fill_parent"
diff --git a/res/layout/activity_shortcut.xml b/res/layout/activity_shortcut.xml
index 6c647e1d..ee35378b 100644
--- a/res/layout/activity_shortcut.xml
+++ b/res/layout/activity_shortcut.xml
@@ -3,7 +3,7 @@
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
-	android:layout_height="wrap_content"
+	android:layout_height="match_parent"
 	android:paddingLeft="@dimen/activity_horizontal_margin"
 	android:paddingRight="@dimen/activity_horizontal_margin"
 	android:paddingTop="@dimen/activity_vertical_margin"
@@ -16,9 +16,9 @@
 		android:layout_height="wrap_content"
 		android:text="@string/shortcut_button_save"
 		android:id="@+id/shortcut_buttonOk"
-		android:layout_alignParentBottom="true"
 		android:layout_alignParentRight="true"
-		android:onClick="saveShortcut"/>
+		android:onClick="saveShortcut"
+		android:layout_below="@+id/shortcut_gamedir"/>
 
 	<EditText
 		android:layout_height="wrap_content"
@@ -32,7 +32,7 @@
 		android:id="@+id/shortcut_name_text"
 		android:layout_alignParentTop="true"
 		android:layout_alignParentRight="true"
-		android:textAppearance="?android:attr/textAppearanceLarge"
+		android:textAppearance="?android:attr/textAppearanceMedium"
 		android:text="@string/shortcut_name"
 	/>
 
@@ -46,7 +46,7 @@
 	<TextView
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:textAppearance="?android:attr/textAppearanceLarge"
+		android:textAppearance="?android:attr/textAppearanceMedium"
 		android:text="@string/cmd_args_text"
 		android:id="@+id/shortcut_textView_args"
 		android:layout_alignParentRight="true"
@@ -62,7 +62,7 @@
 	<TextView
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:textAppearance="?android:attr/textAppearanceLarge"
+		android:textAppearance="?android:attr/textAppearanceMedium"
 		android:text="@string/gamedir"
 		android:id="@+id/shortcut_gamedir_text"
 		android:layout_below="@+id/shortcut_cmdArgs"
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 583ee8e9..569bec66 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -23,4 +23,5 @@
 	<string name="about_copyright" translatable="false">SDLash3D не связан с Valve или с любыми из их партнеров. Все авторские права принадлежат их соотвественным обладателям.</string>
 	<string name="action_settings">Настройки</string>
 	<string name="text_shortcut_test">Ярлык Xash3D (тест)</string>
+	<string name="create_shortcut_button">Создать ярлык</string>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 50402def..e36b6655 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3,7 +3,7 @@
 
     <string name="app_name" translatable="false">Xash3D</string>
 	<string name="launcher_name" translatable="false">Xash3D</string>
-	<string name="launcher_name_test" translatable="false">Xash3D_test</string>
+	<string name="launcher_name_test" translatable="false">Xash3D (test)</string>
     <string-array name="double_tap_actions">
         <item>None</item>
         <item>Shoot</item>
@@ -38,4 +38,5 @@ Special thanks to:\n
 &#8226; Beloko Games for touch controls support\n
 &#8226; libSDL2 developers.\n</string>
     <string name="about_button">About Xash3D Android</string>
+    <string name="create_shortcut_button">Create mod shortcut</string>
 </resources>
diff --git a/src/in/celest/xash3d/LauncherActivity.java b/src/in/celest/xash3d/LauncherActivity.java
index b12b60a5..2c8fe2fc 100644
--- a/src/in/celest/xash3d/LauncherActivity.java
+++ b/src/in/celest/xash3d/LauncherActivity.java
@@ -75,6 +75,12 @@ public class LauncherActivity extends Activity {
 			}
 		});
 	}
+	
+	public void createShortcut(View view)
+	{
+		Intent intent = new Intent(this, ShortcutActivity.class);
+		startActivity(intent);
+	}
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
diff --git a/src/in/celest/xash3d/ShortcutActivity.java b/src/in/celest/xash3d/ShortcutActivity.java
index 2de22967..573f22b6 100644
--- a/src/in/celest/xash3d/ShortcutActivity.java
+++ b/src/in/celest/xash3d/ShortcutActivity.java
@@ -5,6 +5,7 @@ import android.view.View;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import android.widget.Toast;
 import in.celest.xash3d.hl.R;
 import android.widget.EditText;
 import java.io.File;
@@ -66,7 +67,21 @@ public class ShortcutActivity extends Activity
 			icon = BitmapFactory.decodeResource(getResources(), R.drawable.ic_launcher);
 		}
 		wrapIntent.putExtra(Intent.EXTRA_SHORTCUT_ICON, icon);
-		setResult(RESULT_OK, wrapIntent);
-		finish();
+		if(getIntent().getAction() == "android.intent.action.CREATE_SHORTCUT" ) // Called from launcher
+		{
+			setResult(RESULT_OK, wrapIntent);
+			finish();
+		}
+		else try
+		{
+			wrapIntent.setAction("com.android.launcher.action.INSTALL_SHORTCUT");
+			getApplicationContext().sendBroadcast(wrapIntent);
+			Toast.makeText(getApplicationContext(), "Shortcut created!", Toast.LENGTH_SHORT).show();
+		}
+		catch(Exception e)
+		{
+			Toast.makeText(getApplicationContext(), "Problem creating shortcut: " + e.toString() +
+				"\nTry create it manually from laucnher", Toast.LENGTH_LONG).show();
+		}
 	}
 }
diff --git a/test/AndroidManifest.xml b/test/AndroidManifest.xml
index dc85c463..5cc8fecc 100644
--- a/test/AndroidManifest.xml
+++ b/test/AndroidManifest.xml
@@ -73,8 +73,9 @@
     <!-- OpenGL ES 1.1 -->
     <uses-feature android:glEsVersion="0x00010000" /> 
 
-    <!-- Allow writing to external storage -->
+    <!-- Permissions -->
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> 
     <uses-permission android:name="android.permission.INTERNET" /> 
+    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
 </manifest>