Launcher3: Google Feed integration

If Google Search is installed, the Google Feed can be found at
the -1 screen (which is the very left).
This feature is enabled by default.

Change-Id: I495196818699fd378cd60e6dd61b07a0ab951762

4 files changed, 26 insertions, 7 deletions

diff --git a/res/values-ldrtl/config.xml b/res/values-ldrtl/config.xml
new file mode 100644
index 000000000..cd93f5459
--- /dev/null
+++ b/res/values-ldrtl/config.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="pref_show_google_now_summary" translatable="false">@string/msg_minus_one_on_left</string>
+</resources>
diff --git a/res/values/config.xml b/res/values/config.xml
index f87d7a839..8ae0acfd3 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -154,4 +154,5 @@
     <item type="id" name="search_container_hotseat" />
     <item type="id" name="search_container_all_apps" />
 
+    <string name="pref_show_google_now_summary" translatable="false">@string/msg_minus_one_on_left</string>
 </resources>
diff --git a/res/values/lineage_strings.xml b/res/values/lineage_strings.xml
index 980de5da3..3ac2f4300 100644
--- a/res/values/lineage_strings.xml
+++ b/res/values/lineage_strings.xml
@@ -70,9 +70,15 @@
     <string name="settings_icon_force_adaptive_title">Force adaptive icons</string>
     <string name="settings_icon_force_adaptive_desc_on">Icons with a custom shape will be boxed</string>
     <string name="settings_icon_force_adaptive_desc_off">Icons with a custom shape will not be boxed</string>
-    <string name="settings_feed">Enable feed integration</string>
     <string name="settings_edit_allow_title">Allow edit</string>
     <string name="settings_edit_allow_summary_on">Icons and widgets can be added, removed and moved on the homescreen</string>
     <string name="settings_edit_allow_summary_off">Icons and widgets can\'t be added, removed and moved on the homescreen</string>
     <string name="settings_edit_widgets_error">It\'s not possible to add widgets to the home screen</string>
+
+    <!-- Settings title to show Google Now at -1 screen on launcher. [CHAR LIMIT=50] -->
+    <string name="title_show_google_app">Show Google App</string>
+    <!-- Settings message explaining when the -1 screen is available on an LTR device. [CHAR LIMIT=100] -->
+    <string name="msg_minus_one_on_left">When you swipe left from main Home screen</string>
+    <!-- Settings message explaining when the -1 screen is available on an RTL device. [CHAR LIMIT=100] -->
+    <string name="msg_minus_one_on_right">When you swipe left right main Home screen</string>
 </resources>
diff --git a/res/xml/launcher_preferences.xml b/res/xml/launcher_preferences.xml
index e9bf50482..4d23cedf9 100644
--- a/res/xml/launcher_preferences.xml
+++ b/res/xml/launcher_preferences.xml
@@ -19,15 +19,22 @@
         android:icon="@drawable/ic_settings_edit"
         android:key="pref_workspace_edit"
         android:persistent="true"
-        android:title="@string/settings_edit_allow_title"
+        android:summaryOff="@string/settings_edit_allow_summary_off"
         android:summaryOn="@string/settings_edit_allow_summary_on"
-        android:summaryOff="@string/settings_edit_allow_summary_off" />
+        android:title="@string/settings_edit_allow_title" />
 
     <PreferenceCategory
         android:key="category_home"
         android:title="@string/settings_category_home">
 
         <SwitchPreference
+            android:defaultValue="true"
+            android:icon="@drawable/ic_settings_feed"
+            android:key="pref_enable_minus_one"
+            android:summary="@string/pref_show_google_now_summary"
+            android:title="@string/title_show_google_app" />
+
+        <SwitchPreference
             android:defaultValue="@bool/allow_rotation"
             android:icon="@drawable/ic_settings_rotation"
             android:key="pref_allowRotation"
@@ -95,16 +102,16 @@
             android:icon="@drawable/ic_settings_force_adaptive"
             android:key="pref_icon_force_adaptive"
             android:persistent="true"
-            android:summaryOn="@string/settings_icon_force_adaptive_desc_on"
             android:summaryOff="@string/settings_icon_force_adaptive_desc_off"
+            android:summaryOn="@string/settings_icon_force_adaptive_desc_on"
             android:title="@string/settings_icon_force_adaptive_title" />
 
         <com.android.launcher3.views.ButtonPreference
+            android:icon="@drawable/ic_settings_notification"
             android:key="pref_icon_badging"
-            android:title="@string/icon_badging_title"
             android:persistent="false"
-            android:icon="@drawable/ic_settings_notification"
-            android:widgetLayout="@layout/notification_pref_warning" >
+            android:title="@string/icon_badging_title"
+            android:widgetLayout="@layout/notification_pref_warning">
             <intent android:action="android.settings.NOTIFICATION_SETTINGS">
                 <!-- This extra highlights the "Allow icon badges" field in Notification settings -->
                 <extra