From e315963b75dd7f8f6cda42c07d2c5d9a113cbf54 Mon Sep 17 00:00:00 2001
From: Lucas Dupin <dupin@google.com>
Date: Mon, 27 Aug 2018 17:27:29 -0700
Subject: [PATCH] Prepare gesture to be overlayed

Bug: 111414690
Test: make
Change-Id: I28dbbf9b8a6a3662de273aa116ac37941fb765df
---
 res/drawable-nodpi/gesture_ambient_reach |  0
 res/raw/gesture_ambient_reach.mp4        |  0
 res/values/strings.xml                   | 17 ++++-------------
 res/xml/gestures.xml                     |  6 ++++++
 res/xml/reach_gesture_settings.xml       |  4 ++--
 5 files changed, 12 insertions(+), 15 deletions(-)
 create mode 100644 res/drawable-nodpi/gesture_ambient_reach
 create mode 100644 res/raw/gesture_ambient_reach.mp4

diff --git a/res/drawable-nodpi/gesture_ambient_reach b/res/drawable-nodpi/gesture_ambient_reach
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/res/raw/gesture_ambient_reach.mp4 b/res/raw/gesture_ambient_reach.mp4
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6af9721c83c..b29d33c5f5f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -9581,19 +9581,10 @@
     <!-- Summary text for ambient display (device) [CHAR LIMIT=NONE]-->
     <string name="ambient_display_pickup_summary" product="device">To check time, notifications, and other info, pick up your device.</string>
 
-    <!-- Preference and settings suggestion title text for reach gesture (phone) [CHAR LIMIT=60]-->
-    <string name="ambient_display_reach_title" product="default">Reach to check phone</string>
-    <!-- Preference and settings suggestion title text for reach gesture (tablet) [CHAR LIMIT=60]-->
-    <string name="ambient_display_reach_title" product="tablet">Reach to check tablet</string>
-    <!-- Preference and settings suggestion title text for reach gesture (device) [CHAR LIMIT=60]-->
-    <string name="ambient_display_reach_title" product="device">Reach to check device</string>
-
-    <!-- Summary text for ambient display (phone) [CHAR LIMIT=NONE]-->
-    <string name="ambient_display_reach_summary" product="default">To check time, notifications, and other info, reach for your phone.</string>
-    <!-- Summary text for ambient display (tablet) [CHAR LIMIT=NONE]-->
-    <string name="ambient_display_reach_summary" product="tablet">To check time, notifications, and other info, reach for your tablet.</string>
-    <!-- Summary text for ambient display (device) [CHAR LIMIT=NONE]-->
-    <string name="ambient_display_reach_summary" product="device">To check time, notifications, and other info, reach for your device.</string>
+    <!-- Preference and settings suggestion title text for reach gesture [CHAR LIMIT=60]-->
+    <string name="ambient_display_reach_title">Reach gesture</string>
+    <!-- Summary text for ambient display [CHAR LIMIT=NONE]-->
+    <string name="ambient_display_reach_summary" product="default"></string>
 
     <!-- Title text for swiping downwards on fingerprint sensor for notifications [CHAR LIMIT=80]-->
     <string name="fingerprint_swipe_for_notifications_title">Swipe fingerprint for notifications</string>
diff --git a/res/xml/gestures.xml b/res/xml/gestures.xml
index 9f69102a3cb..aa9944646c2 100644
--- a/res/xml/gestures.xml
+++ b/res/xml/gestures.xml
@@ -27,6 +27,12 @@
         android:fragment="com.android.settings.gestures.AssistGestureSettings"
         settings:controller="com.android.settings.gestures.AssistGestureSettingsPreferenceController" />
 
+    <Preference
+        android:key="gesture_reach_summary"
+        android:title="@string/ambient_display_reach_title"
+        android:fragment="com.android.settings.gestures.ReachGestureSettings"
+        settings:controller="com.android.settings.gestures.ReachGesturePreferenceController" />
+
     <Preference
         android:key="gesture_swipe_down_fingerprint_input_summary"
         android:title="@string/fingerprint_swipe_for_notifications_title"
diff --git a/res/xml/reach_gesture_settings.xml b/res/xml/reach_gesture_settings.xml
index 1acc3640516..e933e155ad4 100644
--- a/res/xml/reach_gesture_settings.xml
+++ b/res/xml/reach_gesture_settings.xml
@@ -23,8 +23,8 @@
 
     <com.android.settings.widget.VideoPreference
         android:key="gesture_reach_video"
-        app:animation="@raw/gesture_ambient_lift"
-        app:preview="@drawable/gesture_ambient_lift" />
+        app:animation="@raw/gesture_ambient_reach"
+        app:preview="@drawable/gesture_ambient_reach" />
 
     <SwitchPreference
         android:key="gesture_reach"