From df92896eef85500fd2ddf60afe3f2595cf54c272 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Mon, 26 Dec 2016 04:07:03 +0100
Subject: [PATCH] Add Android 7.1 launcher shortcut for new session

---
 app/src/main/AndroidManifest.xml                |  1 +
 .../java/com/termux/app/TermuxActivity.java     |  8 +++++++-
 app/src/main/res/drawable/ic_new_session.xml    | 17 +++++++++++++++++
 app/src/main/res/xml/shortcuts.xml              | 12 ++++++++++++
 4 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/res/drawable/ic_new_session.xml
 create mode 100644 app/src/main/res/xml/shortcuts.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 25b548ec..3be2fcbb 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -35,6 +35,7 @@
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
             </intent-filter>
+            <meta-data android:name="android.app.shortcuts" android:resource="@xml/shortcuts" />
         </activity>
 
         <activity
diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index c51fbfa4..d1d23387 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -522,7 +522,13 @@ public final class TermuxActivity extends Activity implements ServiceConnection
                 finish();
             }
         } else {
-            switchToSession(getStoredCurrentSessionOrLast());
+            Intent i = getIntent();
+            if (i != null && i.getAction().equals(Intent.ACTION_RUN)) {
+                // Android 7.1 app shortcut from res/xml/shortcuts.xml.
+                addNewSession(false, null);
+            } else {
+                switchToSession(getStoredCurrentSessionOrLast());
+            }
         }
     }
 
diff --git a/app/src/main/res/drawable/ic_new_session.xml b/app/src/main/res/drawable/ic_new_session.xml
new file mode 100644
index 00000000..9b5b24a0
--- /dev/null
+++ b/app/src/main/res/drawable/ic_new_session.xml
@@ -0,0 +1,17 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+
+    <path
+        android:fillColor="#FFF"
+        android:pathData="M 12, 12
+                          m -10.5, 0
+                          a 10.5,10.5 0 1,0 21,0
+                          a 10.5,10.5 0 1,0 -21,0"/>
+
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM17,13h-4v4h-2v-4L7,13v-2h4L11,7h2v4h4v2z"/>
+</vector>
diff --git a/app/src/main/res/xml/shortcuts.xml b/app/src/main/res/xml/shortcuts.xml
new file mode 100644
index 00000000..05d20e06
--- /dev/null
+++ b/app/src/main/res/xml/shortcuts.xml
@@ -0,0 +1,12 @@
+<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
+    <shortcut
+        android:shortcutId="new_session"
+        android:enabled="true"
+        android:icon="@drawable/ic_new_session"
+        android:shortcutShortLabel="@string/new_session">
+        <intent
+            android:action="android.intent.action.RUN"
+            android:targetPackage="com.termux"
+            android:targetClass="com.termux.app.TermuxActivity"/>
+    </shortcut>
+</shortcuts>