From 740fb7621e30156c5238fc8f3582662735855f13 Mon Sep 17 00:00:00 2001
From: Simon Marquis <contact@simon-marquis.fr>
Date: Fri, 25 Nov 2016 15:40:02 +0100
Subject: [PATCH 1/3] Enable two static shortcuts: record and overlay.

---
 telecine/src/debug/res/values/strings.xml     |  4 +-
 telecine/src/main/AndroidManifest.xml         |  7 ++-
 .../com/jakewharton/telecine/Analytics.java   |  2 +
 .../telecine/RecordingSession.java            | 18 +++++++
 .../jakewharton/telecine/TelecineService.java |  4 ++
 .../TelecineShortcutConfigureActivity.java    |  2 +-
 .../TelecineShortcutLaunchActivity.java       |  5 ++
 .../res/drawable/ic_shortcut_overlay_48dp.xml | 14 +++++
 .../res/drawable/ic_shortcut_record_48dp.xml  | 14 +++++
 telecine/src/main/res/values-de/strings.xml   |  2 +-
 telecine/src/main/res/values-es/strings.xml   |  4 +-
 telecine/src/main/res/values-fr/strings.xml   |  6 +--
 telecine/src/main/res/values-it/strings.xml   |  2 +-
 telecine/src/main/res/values-ja/strings.xml   |  2 +-
 telecine/src/main/res/values-ka/strings.xml   |  2 +-
 telecine/src/main/res/values-no/strings.xml   |  2 +-
 telecine/src/main/res/values-pl/strings.xml   |  2 +-
 .../src/main/res/values-pt-rBR/strings.xml    |  2 +-
 .../src/main/res/values-pt-rPT/strings.xml    |  2 +-
 telecine/src/main/res/values-ru/strings.xml   |  2 +-
 telecine/src/main/res/values-tr/strings.xml   |  2 +-
 telecine/src/main/res/values-v25/bools.xml    |  5 ++
 .../src/main/res/values-zh-rCN/strings.xml    |  2 +-
 .../src/main/res/values-zh-rHK/strings.xml    |  4 +-
 .../src/main/res/values-zh-rTW/strings.xml    |  4 +-
 telecine/src/main/res/values/bools.xml        |  4 ++
 telecine/src/main/res/values/strings.xml      |  5 +-
 telecine/src/main/res/xml/shortcuts.xml       | 51 +++++++++++++++++++
 28 files changed, 149 insertions(+), 26 deletions(-)
 create mode 100644 telecine/src/main/res/drawable/ic_shortcut_overlay_48dp.xml
 create mode 100644 telecine/src/main/res/drawable/ic_shortcut_record_48dp.xml
 create mode 100644 telecine/src/main/res/values-v25/bools.xml
 create mode 100644 telecine/src/main/res/values/bools.xml
 create mode 100644 telecine/src/main/res/xml/shortcuts.xml

diff --git a/telecine/src/debug/res/values/strings.xml b/telecine/src/debug/res/values/strings.xml
index 931a1b8..a3a4121 100644
--- a/telecine/src/debug/res/values/strings.xml
+++ b/telecine/src/debug/res/values/strings.xml
@@ -3,6 +3,6 @@
 <resources>
   <string name="launcher_name" translatable="false">Telecine Debug</string>
 
-  <string name="shortcut_name">Launch Debug</string>
-  <string name="tile_name">Launch Telecine Debug</string>
+  <string name="launch">Launch Debug</string>
+  <string name="launch_telecine">Launch Telecine Debug</string>
 </resources>
diff --git a/telecine/src/main/AndroidManifest.xml b/telecine/src/main/AndroidManifest.xml
index cbde729..219a5ab 100644
--- a/telecine/src/main/AndroidManifest.xml
+++ b/telecine/src/main/AndroidManifest.xml
@@ -30,6 +30,10 @@
       <intent-filter>
         <action android:name="android.service.quicksettings.action.QS_TILE_PREFERENCES"/>
       </intent-filter>
+      <meta-data
+          android:name="android.app.shortcuts"
+          android:resource="@xml/shortcuts"
+          />
     </activity>
 
     <service android:name=".TelecineService"/>
@@ -41,6 +45,7 @@
         android:theme="@style/Theme.Telecine.Transparent"
         android:excludeFromRecents="true"
         android:taskAffinity=""
+        android:enabled="@bool/widget_shortcut_enabled"
         >
       <intent-filter>
         <action android:name="android.intent.action.CREATE_SHORTCUT" />
@@ -56,7 +61,7 @@
 
     <service
         android:icon="@drawable/ic_videocam_white_24dp"
-        android:label="@string/tile_name"
+        android:label="@string/launch_telecine"
         android:name=".TelecineTileService"
         android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
       <intent-filter>
diff --git a/telecine/src/main/java/com/jakewharton/telecine/Analytics.java b/telecine/src/main/java/com/jakewharton/telecine/Analytics.java
index 42fca61..3030e41 100644
--- a/telecine/src/main/java/com/jakewharton/telecine/Analytics.java
+++ b/telecine/src/main/java/com/jakewharton/telecine/Analytics.java
@@ -26,6 +26,8 @@ interface Analytics {
   String ACTION_QUICK_TILE_ADDED = "Quick Tile Added";
   String ACTION_QUICK_TILE_LAUNCHED = "Quick Tile Launched";
   String ACTION_QUICK_TILE_REMOVED = "Quick Tile Removed";
+  String ACTION_STATIC_SHORTCUT_RECORD = "Static Shortcut Record";
+  String ACTION_STATIC_SHORTCUT_OVERLAY = "Static Shortcut Overlay";
 
   String VARIABLE_RECORDING_LENGTH = "Recording Length";
 
diff --git a/telecine/src/main/java/com/jakewharton/telecine/RecordingSession.java b/telecine/src/main/java/com/jakewharton/telecine/RecordingSession.java
index dbca65f..ba28fe1 100644
--- a/telecine/src/main/java/com/jakewharton/telecine/RecordingSession.java
+++ b/telecine/src/main/java/com/jakewharton/telecine/RecordingSession.java
@@ -194,6 +194,24 @@ private RecordingInfo getRecordingInfo() {
         cameraWidth, cameraHeight, cameraFrameRate, sizePercentage);
   }
 
+  /** Perform a click on the start button to simulate the auto-recording. */
+  void triggerAutoRecording() {
+    if (overlayView == null) {
+      throw new AssertionError();
+    }
+    // Most of the time, overlayView is not yet attached to the Window
+    if (overlayView.isAttachedToWindow()) {
+      overlayView.onStartClicked();
+    } else {
+      overlayView.post(new Runnable() {
+        @Override
+        public void run() {
+          triggerAutoRecording();
+        }
+      });
+    }
+  }
+
   private void startRecording() {
     Timber.d("Starting screen recording...");
 
diff --git a/telecine/src/main/java/com/jakewharton/telecine/TelecineService.java b/telecine/src/main/java/com/jakewharton/telecine/TelecineService.java
index 88c5a6b..11c93d1 100644
--- a/telecine/src/main/java/com/jakewharton/telecine/TelecineService.java
+++ b/telecine/src/main/java/com/jakewharton/telecine/TelecineService.java
@@ -98,6 +98,10 @@ static Intent newIntent(Context context, int resultCode, Intent data) {
             videoSizePercentageProvider);
     recordingSession.showOverlay();
 
+    if (data.getBooleanExtra(TelecineShortcutLaunchActivity.EXTRA_AUTO_RECORDING, false)) {
+      Timber.d("Auto-recording requested!");
+      recordingSession.triggerAutoRecording();
+    }
     return START_NOT_STICKY;
   }
 
diff --git a/telecine/src/main/java/com/jakewharton/telecine/TelecineShortcutConfigureActivity.java b/telecine/src/main/java/com/jakewharton/telecine/TelecineShortcutConfigureActivity.java
index 88fa917..76a73e8 100644
--- a/telecine/src/main/java/com/jakewharton/telecine/TelecineShortcutConfigureActivity.java
+++ b/telecine/src/main/java/com/jakewharton/telecine/TelecineShortcutConfigureActivity.java
@@ -24,7 +24,7 @@ public final class TelecineShortcutConfigureActivity extends Activity {
     ShortcutIconResource icon = ShortcutIconResource.fromContext(this, R.drawable.ic_launcher);
 
     Intent intent = new Intent();
-    intent.putExtra(Intent.EXTRA_SHORTCUT_NAME, getString(R.string.shortcut_name));
+    intent.putExtra(Intent.EXTRA_SHORTCUT_NAME, getString(R.string.launch));
     intent.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE, icon);
     intent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, launchIntent);
 
diff --git a/telecine/src/main/java/com/jakewharton/telecine/TelecineShortcutLaunchActivity.java b/telecine/src/main/java/com/jakewharton/telecine/TelecineShortcutLaunchActivity.java
index 08ab1fd..7531a10 100644
--- a/telecine/src/main/java/com/jakewharton/telecine/TelecineShortcutLaunchActivity.java
+++ b/telecine/src/main/java/com/jakewharton/telecine/TelecineShortcutLaunchActivity.java
@@ -9,6 +9,7 @@
 
 public final class TelecineShortcutLaunchActivity extends Activity {
   private static final String KEY_ACTION = "launch-action";
+  static final String EXTRA_AUTO_RECORDING = "auto-recording";
 
   static Intent createQuickTileIntent(Context context) {
     Intent intent = new Intent(context, TelecineShortcutLaunchActivity.class);
@@ -36,6 +37,10 @@ static Intent createQuickTileIntent(Context context) {
   }
 
   @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+    if (getIntent().getBooleanExtra(EXTRA_AUTO_RECORDING, false) && data != null) {
+      // Add the auto-recording extra from the original intent to the result data.
+      data.putExtra(EXTRA_AUTO_RECORDING, true);
+    }
     if (!CaptureHelper.handleActivityResult(this, requestCode, resultCode, data, analytics)) {
       super.onActivityResult(requestCode, resultCode, data);
     }
diff --git a/telecine/src/main/res/drawable/ic_shortcut_overlay_48dp.xml b/telecine/src/main/res/drawable/ic_shortcut_overlay_48dp.xml
new file mode 100644
index 0000000..908e008
--- /dev/null
+++ b/telecine/src/main/res/drawable/ic_shortcut_overlay_48dp.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportHeight="49.333336"
+    android:viewportWidth="49.333336">
+    <path
+        android:fillAlpha="1"
+        android:fillColor="#f5f5f5"
+        android:pathData="M24.67,24.67m-22,0a22,22 0,1 1,44 0a22,22 0,1 1,-44 0" />
+    <path
+        android:fillAlpha="1"
+        android:fillColor="#e73c35"
+        android:pathData="m31.42,17.92 l-13.5,0c-0.82,0 -1.5,0.68 -1.5,1.5l0,10.5c0,0.82 0.68,1.5 1.5,1.5l13.5,0c0.82,0 1.5,-0.68 1.5,-1.5l0,-10.5c0,-0.82 -0.68,-1.5 -1.5,-1.5zM31.42,29.92 L17.92,29.92 17.92,19.42 25.42,19.42 25.42,22.42 31.42,22.42 31.42,29.92z" />
+</vector>
diff --git a/telecine/src/main/res/drawable/ic_shortcut_record_48dp.xml b/telecine/src/main/res/drawable/ic_shortcut_record_48dp.xml
new file mode 100644
index 0000000..8746102
--- /dev/null
+++ b/telecine/src/main/res/drawable/ic_shortcut_record_48dp.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportHeight="49.333336"
+    android:viewportWidth="49.333336">
+    <path
+        android:fillAlpha="1"
+        android:fillColor="#f5f5f5"
+        android:pathData="M24.67,24.67m-22,0a22,22 0,1 1,44 0a22,22 0,1 1,-44 0" />
+    <path
+        android:fillAlpha="1"
+        android:fillColor="#e73c35"
+        android:pathData="m29.67,23.17 l0,-3.5c0,-0.55 -0.45,-1 -1,-1l-12,0c-0.55,0 -1,0.45 -1,1l0,10c0,0.55 0.45,1 1,1l12,0c0.55,0 1,-0.45 1,-1l0,-3.5 4,4 0,-11 -4,4z" />
+</vector>
diff --git a/telecine/src/main/res/values-de/strings.xml b/telecine/src/main/res/values-de/strings.xml
index 1e91214..f597df8 100644
--- a/telecine/src/main/res/values-de/strings.xml
+++ b/telecine/src/main/res/values-de/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <resources>
-  <string name="shortcut_name">Aufnahme starten</string>
+  <string name="launch">Aufnahme starten</string>
   <string name="clear">Leeren</string>
   <string name="record">Aufnehmen</string>
   <string name="countdown_one">1…</string>
diff --git a/telecine/src/main/res/values-es/strings.xml b/telecine/src/main/res/values-es/strings.xml
index d776b31..b026c38 100644
--- a/telecine/src/main/res/values-es/strings.xml
+++ b/telecine/src/main/res/values-es/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="shortcut_name">Inicia</string>
+    <string name="launch">Inicia</string>
     <string name="clear">Despejar</string>
     <string name="record">Grabar</string>
     <string name="launch_overlay">Inicia superposición</string>
@@ -16,4 +16,4 @@
     <string name="notification_recording_subtitle">Toque el reloj para detener la grabación.</string>
     <string name="recording_notification">Notificación de grabación</string>
     <string name="show_touches">Mostrar Toques</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/telecine/src/main/res/values-fr/strings.xml b/telecine/src/main/res/values-fr/strings.xml
index b2c81d5..8b99261 100644
--- a/telecine/src/main/res/values-fr/strings.xml
+++ b/telecine/src/main/res/values-fr/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <resources>
-  <string name="shortcut_name">Lancer</string>
+  <string name="launch">Lancer</string>
   <string name="clear">Effacer</string>
   <string name="record">Enregistrer</string>
   <string name="countdown_one">1…</string>
@@ -13,10 +13,10 @@
   <string name="recents_hide">Masquer dans les applications récentes</string>
   <string name="video_size_percentage">Taille de la vidéo</string>
   <string name="notification_captured_title">Capture d\'écran vidéo réussie.</string>
-  <string name="notification_captured_subtitle">Appuyez pour afficher votre capture d\'écran vidéo.</string>  
+  <string name="notification_captured_subtitle">Appuyez pour afficher votre capture d\'écran vidéo.</string>
   <string name="notification_captured_share">Partager</string>
   <string name="notification_captured_delete">Supprimer</string>
-  <string name="notification_recording_title">Capture d\'écran vidéo en cours.</string>  
+  <string name="notification_recording_title">Capture d\'écran vidéo en cours.</string>
   <string name="notification_recording_subtitle">Appuyez sur la zone de l\'horloge pour arrêter.</string>
   <string name="recording_notification">Notification d\'enregistrement</string>
   <string name="show_touches">Afficher les appuis</string>
diff --git a/telecine/src/main/res/values-it/strings.xml b/telecine/src/main/res/values-it/strings.xml
index 0d69095..ee40afb 100644
--- a/telecine/src/main/res/values-it/strings.xml
+++ b/telecine/src/main/res/values-it/strings.xml
@@ -2,7 +2,7 @@
 
 
 <resources>
-  <string name="shortcut_name">Avvia</string>
+  <string name="launch">Avvia</string>
   <string name="clear">Clear</string>
   <string name="record">Registra</string>
   <string name="countdown_one">1…</string>
diff --git a/telecine/src/main/res/values-ja/strings.xml b/telecine/src/main/res/values-ja/strings.xml
index 62907a6..d1ea5e6 100644
--- a/telecine/src/main/res/values-ja/strings.xml
+++ b/telecine/src/main/res/values-ja/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <resources>
-  <string name="shortcut_name">起動</string>
+  <string name="launch">起動</string>
   <string name="clear">クリア</string>
   <string name="record">録画</string>
   <string name="countdown_one">1…</string>
diff --git a/telecine/src/main/res/values-ka/strings.xml b/telecine/src/main/res/values-ka/strings.xml
index 34451c9..7ee13ff 100644
--- a/telecine/src/main/res/values-ka/strings.xml
+++ b/telecine/src/main/res/values-ka/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="shortcut_name">ჩაწერის დაწყება</string>
+    <string name="launch">ჩაწერის დაწყება</string>
     <string name="clear">წაშლა</string>
     <string name="record">ჩაწერა</string>
     <string name="launch_overlay">ჩაწერის დაწყება ფონურ რეჟიმში</string>
diff --git a/telecine/src/main/res/values-no/strings.xml b/telecine/src/main/res/values-no/strings.xml
index 2b98461..3336bcc 100644
--- a/telecine/src/main/res/values-no/strings.xml
+++ b/telecine/src/main/res/values-no/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <resources>
-  <string name="shortcut_name">Start</string>
+  <string name="launch">Start</string>
   <string name="clear">Slett</string>
   <string name="record">Ta opp</string>
   <string name="launch_overlay">Start overlay</string>
diff --git a/telecine/src/main/res/values-pl/strings.xml b/telecine/src/main/res/values-pl/strings.xml
index 0eb9584..f8ed72a 100644
--- a/telecine/src/main/res/values-pl/strings.xml
+++ b/telecine/src/main/res/values-pl/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <resources>
-  <string name="shortcut_name">Uruchom</string>
+  <string name="launch">Uruchom</string>
   <string name="clear">Wyczyść</string>
   <string name="record">Nagraj</string>
   <string name="countdown_one">1…</string>
diff --git a/telecine/src/main/res/values-pt-rBR/strings.xml b/telecine/src/main/res/values-pt-rBR/strings.xml
index a6b2212..7e2ac59 100644
--- a/telecine/src/main/res/values-pt-rBR/strings.xml
+++ b/telecine/src/main/res/values-pt-rBR/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="shortcut_name">Iniciar</string>
+  <string name="launch">Iniciar</string>
   <string name="tile_name">Iniciar Telecine</string>
   <string name="clear">Limpar</string>
   <string name="record">Gravar</string>
diff --git a/telecine/src/main/res/values-pt-rPT/strings.xml b/telecine/src/main/res/values-pt-rPT/strings.xml
index 8a48354..7e7f664 100644
--- a/telecine/src/main/res/values-pt-rPT/strings.xml
+++ b/telecine/src/main/res/values-pt-rPT/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="shortcut_name">Iniciar</string>
+  <string name="launch">Iniciar</string>
   <string name="clear">Limpar</string>
   <string name="record">Gravar</string>
   <string name="countdown_one">1…</string>
diff --git a/telecine/src/main/res/values-ru/strings.xml b/telecine/src/main/res/values-ru/strings.xml
index adbfee1..606b69d 100644
--- a/telecine/src/main/res/values-ru/strings.xml
+++ b/telecine/src/main/res/values-ru/strings.xml
@@ -16,7 +16,7 @@
   <string name="recents_hide">Не показывать в недавних приложениях</string>
   <string name="record">Запись</string>
   <string name="recording_notification">Уведомление о записи экрана</string>
-  <string name="shortcut_name">Начать запись</string>
+  <string name="launch">Начать запись</string>
   <string name="show_touches">Показывать нажатия на экран</string>
   <string name="video_size_percentage">Размер видео</string>
 </resources>
diff --git a/telecine/src/main/res/values-tr/strings.xml b/telecine/src/main/res/values-tr/strings.xml
index b727d9d..04227e8 100644
--- a/telecine/src/main/res/values-tr/strings.xml
+++ b/telecine/src/main/res/values-tr/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <resources>
-    <string name="shortcut_name">Çalıştır</string>
+    <string name="launch">Çalıştır</string>
     <string name="clear">Temizle</string>
     <string name="record">Kayıt</string>
     <string name="countdown_one">1…</string>
diff --git a/telecine/src/main/res/values-v25/bools.xml b/telecine/src/main/res/values-v25/bools.xml
new file mode 100644
index 0000000..a516b6b
--- /dev/null
+++ b/telecine/src/main/res/values-v25/bools.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <!-- Static shortcuts are used on API 25 instead. -->
+  <bool name="widget_shortcut_enabled">false</bool>
+</resources>
diff --git a/telecine/src/main/res/values-zh-rCN/strings.xml b/telecine/src/main/res/values-zh-rCN/strings.xml
index 1730703..a736c0c 100644
--- a/telecine/src/main/res/values-zh-rCN/strings.xml
+++ b/telecine/src/main/res/values-zh-rCN/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <resources>
-  <string name="shortcut_name">启动</string>
+  <string name="launch">启动</string>
   <string name="clear">清除</string>
   <string name="record">记录</string>
   <string name="countdown_one">1…</string>
diff --git a/telecine/src/main/res/values-zh-rHK/strings.xml b/telecine/src/main/res/values-zh-rHK/strings.xml
index 5dfb594..dbeda17 100644
--- a/telecine/src/main/res/values-zh-rHK/strings.xml
+++ b/telecine/src/main/res/values-zh-rHK/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <resources>
-  <string name="shortcut_name">啟動</string>
+  <string name="launch">啟動</string>
   <string name="clear">清除</string>
   <string name="record">記錄</string>
   <string name="countdown_one">1…</string>
@@ -18,4 +18,4 @@
   <string name="notification_recording_title">錄製屏幕中.</string>
   <string name="notification_recording_subtitle">觸摸時鍾區域停止錄像.</string>
   <string name="recording_notification">錄像通知</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/telecine/src/main/res/values-zh-rTW/strings.xml b/telecine/src/main/res/values-zh-rTW/strings.xml
index e9e56b5..5e8833c 100644
--- a/telecine/src/main/res/values-zh-rTW/strings.xml
+++ b/telecine/src/main/res/values-zh-rTW/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <resources>
-  <string name="shortcut_name">啟動</string>
+  <string name="launch">啟動</string>
   <string name="clear">清除</string>
   <string name="record">記錄</string>
   <string name="countdown_one">1…</string>
@@ -18,4 +18,4 @@
   <string name="notification_recording_title">錄製屏幕中.</string>
   <string name="notification_recording_subtitle">觸摸時鍾區域停止錄像.</string>
   <string name="recording_notification">錄像通知</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/telecine/src/main/res/values/bools.xml b/telecine/src/main/res/values/bools.xml
new file mode 100644
index 0000000..80f3ba1
--- /dev/null
+++ b/telecine/src/main/res/values/bools.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <bool name="widget_shortcut_enabled">true</bool>
+</resources>
diff --git a/telecine/src/main/res/values/strings.xml b/telecine/src/main/res/values/strings.xml
index eb085f9..c5e5ef2 100644
--- a/telecine/src/main/res/values/strings.xml
+++ b/telecine/src/main/res/values/strings.xml
@@ -4,10 +4,9 @@
   <string name="app_name" translatable="false">Telecine</string>
   <string name="launcher_name" translatable="false">@string/app_name</string>
 
-  <string name="shortcut_name">Launch</string>
-  <string name="tile_name">Launch Telecine</string>
   <string name="clear">Clear</string>
   <string name="record">Record</string>
+  <string name="start_recording">Start Recording</string>
   <string name="countdown_one">1…</string>
   <string name="countdown_two">2…</string>
   <string name="countdown_three">3…</string>
@@ -24,6 +23,8 @@
   <string name="notification_recording_subtitle">Touch the clock area to stop recording.</string>
   <string name="recording_notification">Recording Notification</string>
   <string name="show_touches">Show Touches</string>
+  <string name="launch">Launch</string>
+  <string name="launch_telecine">Launch Telecine</string>
 
   <array name="countdown">
     <item>@string/countdown_three</item>
diff --git a/telecine/src/main/res/xml/shortcuts.xml b/telecine/src/main/res/xml/shortcuts.xml
new file mode 100644
index 0000000..6545456
--- /dev/null
+++ b/telecine/src/main/res/xml/shortcuts.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shortcuts
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:targetApi="n_mr1"
+    >
+  <shortcut
+      android:enabled="true"
+      android:icon="@drawable/ic_shortcut_overlay"
+      android:shortcutDisabledMessage="@string/launch"
+      android:shortcutId="overlay"
+      android:shortcutLongLabel="@string/launch_telecine"
+      android:shortcutShortLabel="@string/launch"
+      >
+    <intent
+        android:action="com.jakewharton.telecine.STATIC_SHORTCUT_OVERLAY"
+        android:targetClass="com.jakewharton.telecine.TelecineShortcutLaunchActivity"
+        android:targetPackage="com.jakewharton.telecine"
+        >
+      <extra
+          android:name="launch-action"
+          android:value="Static Shortcut Overlay"
+          />
+    </intent>
+    <categories android:name="android.shortcut.conversation"/>
+  </shortcut>
+  <shortcut
+      android:enabled="true"
+      android:icon="@drawable/ic_shortcut_record"
+      android:shortcutDisabledMessage="@string/record"
+      android:shortcutId="record"
+      android:shortcutLongLabel="@string/start_recording"
+      android:shortcutShortLabel="@string/record"
+      >
+    <intent
+        android:action="com.jakewharton.telecine.STATIC_SHORTCUT_RECORD"
+        android:targetClass="com.jakewharton.telecine.TelecineShortcutLaunchActivity"
+        android:targetPackage="com.jakewharton.telecine"
+        >
+      <extra
+          android:name="launch-action"
+          android:value="Static Shortcut Record"
+          />
+      <extra
+          android:name="auto-recording"
+          android:value="true"
+          />
+    </intent>
+    <categories android:name="android.shortcut.conversation"/>
+  </shortcut>
+</shortcuts>

From f1a99bee901da5a70df4f1ab6394feba28bba1f4 Mon Sep 17 00:00:00 2001
From: Simon Marquis <contact@simon-marquis.fr>
Date: Wed, 4 Jan 2017 22:48:56 +0100
Subject: [PATCH 2/3] Fix drawable resource name

---
 telecine/src/main/res/xml/shortcuts.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/telecine/src/main/res/xml/shortcuts.xml b/telecine/src/main/res/xml/shortcuts.xml
index 6545456..7cbeeb6 100644
--- a/telecine/src/main/res/xml/shortcuts.xml
+++ b/telecine/src/main/res/xml/shortcuts.xml
@@ -6,7 +6,7 @@
     >
   <shortcut
       android:enabled="true"
-      android:icon="@drawable/ic_shortcut_overlay"
+      android:icon="@drawable/ic_shortcut_overlay_48dp"
       android:shortcutDisabledMessage="@string/launch"
       android:shortcutId="overlay"
       android:shortcutLongLabel="@string/launch_telecine"
@@ -26,7 +26,7 @@
   </shortcut>
   <shortcut
       android:enabled="true"
-      android:icon="@drawable/ic_shortcut_record"
+      android:icon="@drawable/ic_shortcut_record_48dp"
       android:shortcutDisabledMessage="@string/record"
       android:shortcutId="record"
       android:shortcutLongLabel="@string/start_recording"

From e218e595d049db12928e8337c3c8e7d3218fbb84 Mon Sep 17 00:00:00 2001
From: Simon Marquis <contact@simon-marquis.fr>
Date: Wed, 4 Jan 2017 22:53:00 +0100
Subject: [PATCH 3/3] Add debug version of shortcuts as explained in #135 and
 #139

---
 telecine/src/debug/res/xml/shortcuts.xml | 51 ++++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 telecine/src/debug/res/xml/shortcuts.xml

diff --git a/telecine/src/debug/res/xml/shortcuts.xml b/telecine/src/debug/res/xml/shortcuts.xml
new file mode 100644
index 0000000..c6ad403
--- /dev/null
+++ b/telecine/src/debug/res/xml/shortcuts.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shortcuts
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:targetApi="n_mr1"
+    >
+  <shortcut
+      android:enabled="true"
+      android:icon="@drawable/ic_shortcut_overlay_48dp"
+      android:shortcutDisabledMessage="@string/launch"
+      android:shortcutId="overlay"
+      android:shortcutLongLabel="@string/launch_telecine"
+      android:shortcutShortLabel="@string/launch"
+      >
+    <intent
+        android:action="com.jakewharton.telecine.STATIC_SHORTCUT_OVERLAY"
+        android:targetClass="com.jakewharton.telecine.TelecineShortcutLaunchActivity"
+        android:targetPackage="com.jakewharton.telecine.debug"
+        >
+      <extra
+          android:name="launch-action"
+          android:value="Static Shortcut Overlay"
+          />
+    </intent>
+    <categories android:name="android.shortcut.conversation"/>
+  </shortcut>
+  <shortcut
+      android:enabled="true"
+      android:icon="@drawable/ic_shortcut_record_48dp"
+      android:shortcutDisabledMessage="@string/record"
+      android:shortcutId="record"
+      android:shortcutLongLabel="@string/start_recording"
+      android:shortcutShortLabel="@string/record"
+      >
+    <intent
+        android:action="com.jakewharton.telecine.STATIC_SHORTCUT_RECORD"
+        android:targetClass="com.jakewharton.telecine.TelecineShortcutLaunchActivity"
+        android:targetPackage="com.jakewharton.telecine.debug"
+        >
+      <extra
+          android:name="launch-action"
+          android:value="Static Shortcut Record"
+          />
+      <extra
+          android:name="auto-recording"
+          android:value="true"
+          />
+    </intent>
+    <categories android:name="android.shortcut.conversation"/>
+  </shortcut>
+</shortcuts>