From 469877567a0da436d213698c67dc53694f9d928d Mon Sep 17 00:00:00 2001
From: Joey <joey@lineageos.org>
Date: Fri, 1 Nov 2019 11:56:19 +0100
Subject: Update default workspace

Change-Id: I852edb6dda3e2030f97eb244ee35c1a647366901
Signed-off-by: Joey <joey@lineageos.org>
---
 res/values/lineage_strings.xml    |  3 +-
 res/xml/default_workspace_4x4.xml | 84 +++++++++++++++++++--------------------
 res/xml/default_workspace_5x5.xml | 74 +++++++++++++++-------------------
 3 files changed, 75 insertions(+), 86 deletions(-)

diff --git a/res/values/lineage_strings.xml b/res/values/lineage_strings.xml
index 58b3a572d..02a8834a7 100644
--- a/res/values/lineage_strings.xml
+++ b/res/values/lineage_strings.xml
@@ -27,6 +27,5 @@
     <string name="msg_minus_one_on_right">When you swipe left from main home screen</string>
 
     <!-- Folder titles -->
-    <string name="google_title" translatable="false">Google</string>
-    <string name="play_folder_title">Play</string>
+    <string name="google_folder_title" translatable="false">Google</string>
 </resources>
diff --git a/res/xml/default_workspace_4x4.xml b/res/xml/default_workspace_4x4.xml
index 0e0ad1c55..1b5be0da1 100644
--- a/res/xml/default_workspace_4x4.xml
+++ b/res/xml/default_workspace_4x4.xml
@@ -45,15 +45,22 @@
         launcher:screen="2"
         launcher:x="2"
         launcher:y="0" >
-        <favorite
-            launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_BROWSER;end" />
+        <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_CONTACTS;end" />
+    </resolve>
+
+    <resolve
+         launcher:container="-101"
+         launcher:screen="3"
+         launcher:x="3"
+         launcher:y="0" >
+        <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_BROWSER;end" />
         <favorite launcher:uri="http://www.example.com/" />
     </resolve>
 
     <resolve
         launcher:container="-101"
-        launcher:screen="3"
-        launcher:x="3"
+        launcher:screen="4"
+        launcher:x="4"
         launcher:y="0" >
         <favorite launcher:uri="#Intent;action=android.media.action.STILL_IMAGE_CAMERA;end" />
         <favorite launcher:uri="#Intent;action=android.intent.action.CAMERA_BUTTON;end" />
@@ -78,59 +85,52 @@
         launcher:spanX="4"
         launcher:spanY="2" />
 
-    <!-- Google Folder -->
-    <folder launcher:screen="0" launcher:x="0" launcher:y="-1" launcher:title="@string/google_title">
-        <favorite
-            launcher:className="com.google.android.googlequicksearchbox.SearchActivity"
-            launcher:packageName="com.google.android.googlequicksearchbox" />
-        <favorite
-            launcher:className="com.google.android.gm.ConversationListActivityGmail"
-            launcher:packageName="com.google.android.gm" />
+    <!-- Google folder -->
+    <!-- Google, Chrome, Gmail, Maps, YouTube, (Drive), (Music), (Movies), Hangouts, Photos -->
+    <folder
+        launcher:title="@string/google_folder_title"
+        launcher:screen="0"
+        launcher:x="0"
+        launcher:y="3">
         <favorite
-            launcher:className="com.google.android.maps.MapsActivity"
-            launcher:packageName="com.google.android.apps.maps" />
+            launcher:packageName="com.google.android.googlequicksearchbox"
+            launcher:className="com.google.android.googlequicksearchbox.SearchActivity"/>
         <favorite
-            launcher:className="com.google.android.youtube.app.honeycomb.Shell$HomeActivity"
-            launcher:packageName="com.google.android.youtube" />
+            launcher:packageName="com.google.android.gm"
+            launcher:className="com.google.android.gm.ConversationListActivityGmail"/>
         <favorite
-            launcher:className="com.google.android.apps.docs.app.NewMainProxyActivity"
-            launcher:packageName="com.google.android.apps.docs" />
+            launcher:packageName="com.google.android.apps.maps"
+            launcher:className="com.google.android.maps.MapsActivity"/>
         <favorite
-            launcher:className="com.android.music.activitymanagement.TopLevelActivity"
-            launcher:packageName="com.google.android.music" />
+            launcher:packageName="com.google.android.youtube"
+            launcher:className="com.google.android.youtube.app.honeycomb.Shell$HomeActivity"/>
         <favorite
-            launcher:className="com.google.android.youtube.videos.EntryPoint"
-            launcher:packageName="com.google.android.videos" />
+            launcher:packageName="com.google.android.apps.docs"
+            launcher:className="com.google.android.apps.docs.app.NewMainProxyActivity"/>
         <favorite
-            launcher:className="com.google.android.apps.photos.home.HomeActivity"
-            launcher:packageName="com.google.android.apps.photos" />
+            launcher:packageName="com.google.android.music"
+            launcher:className="com.android.music.activitymanagement.TopLevelActivity"/>
         <favorite
-            launcher:className="com.android.calendar.AllInOneActivity"
-            launcher:packageName="com.google.android.calendar" />
+            launcher:packageName="com.google.android.videos"
+            launcher:className="com.google.android.youtube.videos.EntryPoint"/>
         <favorite
-            launcher:className="com.google.android.keep.activities.BrowseActivity"
-            launcher:packageName="com.google.android.keep" />
+            launcher:packageName="com.google.android.apps.photos"
+            launcher:className="com.google.android.apps.photos.home.HomeActivity"/>
     </folder>
 
-    <resolve
+    <favorite
         launcher:screen="0"
         launcher:x="1"
-        launcher:y="-1" >
-        <favorite
-            launcher:className="com.google.android.apps.tachyon.MainActivity"
-            launcher:packageName="com.google.android.apps.tachyon" />
-    </resolve>
+        launcher:y="3"
+        launcher:packageName="com.google.android.apps.tachyon"
+        launcher:className="com.google.android.apps.tachyon.MainActivity"/>
 
-    <resolve
+    <favorite
         launcher:screen="0"
         launcher:x="3"
-        launcher:y="-1">
-        <favorite
-            launcher:packageName="com.android.vending"
-            launcher:className="com.android.vending.AssetBrowserActivity" />
-        <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_MARKET;end" />
-        <favorite launcher:uri="market://details?id=com.android.launcher" />
-    </resolve>
+        launcher:y="3"
+        launcher:packageName="com.android.vending"
+        launcher:className="com.android.vending.AssetBrowserActivity"/>
 
     <!-- Screen 1 -->
     <appwidget
diff --git a/res/xml/default_workspace_5x5.xml b/res/xml/default_workspace_5x5.xml
index a2d130717..4635ebabf 100644
--- a/res/xml/default_workspace_5x5.xml
+++ b/res/xml/default_workspace_5x5.xml
@@ -45,8 +45,7 @@
         launcher:screen="2"
         launcher:x="2"
         launcher:y="0" >
-        <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_MAPS;end" />
-        <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_MUSIC;end" />
+        <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_CONTACTS;end" />
     </resolve>
 
     <resolve
@@ -54,8 +53,7 @@
         launcher:screen="3"
         launcher:x="3"
         launcher:y="0" >
-        <favorite
-            launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_BROWSER;end" />
+        <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_BROWSER;end" />
         <favorite launcher:uri="http://www.example.com/" />
     </resolve>
 
@@ -78,7 +76,6 @@
         launcher:spanX="5"
         launcher:spanY="1" />
 
-
     <appwidget
         launcher:packageName="org.lineageos.lockclock"
         launcher:className="org.lineageos.lockclock.ClockWidgetProvider"
@@ -89,58 +86,51 @@
         launcher:spanY="2" />
 
     <!-- Google Folder -->
-    <folder launcher:screen="0" launcher:x="0" launcher:y="-1" launcher:title="@string/google_title">
-        <favorite
-            launcher:className="com.google.android.googlequicksearchbox.SearchActivity"
-            launcher:packageName="com.google.android.googlequicksearchbox" />
-        <favorite
-            launcher:className="com.google.android.gm.ConversationListActivityGmail"
-            launcher:packageName="com.google.android.gm" />
+    <!-- Google, Chrome, Gmail, Maps, YouTube, (Drive), (Music), (Movies), Hangouts, Photos -->
+    <folder
+        launcher:title="@string/google_folder_title"
+        launcher:screen="0"
+        launcher:x="0"
+        launcher:y="4">
         <favorite
-            launcher:className="com.google.android.maps.MapsActivity"
-            launcher:packageName="com.google.android.apps.maps" />
+            launcher:packageName="com.google.android.googlequicksearchbox"
+            launcher:className="com.google.android.googlequicksearchbox.SearchActivity"/>
         <favorite
-            launcher:className="com.google.android.youtube.app.honeycomb.Shell$HomeActivity"
-            launcher:packageName="com.google.android.youtube" />
+            launcher:packageName="com.google.android.gm"
+            launcher:className="com.google.android.gm.ConversationListActivityGmail"/>
         <favorite
-            launcher:className="com.google.android.apps.docs.app.NewMainProxyActivity"
-            launcher:packageName="com.google.android.apps.docs" />
+            launcher:packageName="com.google.android.apps.maps"
+            launcher:className="com.google.android.maps.MapsActivity"/>
         <favorite
-            launcher:className="com.android.music.activitymanagement.TopLevelActivity"
-            launcher:packageName="com.google.android.music" />
+            launcher:packageName="com.google.android.youtube"
+            launcher:className="com.google.android.youtube.app.honeycomb.Shell$HomeActivity"/>
         <favorite
-            launcher:className="com.google.android.youtube.videos.EntryPoint"
-            launcher:packageName="com.google.android.videos" />
+            launcher:packageName="com.google.android.apps.docs"
+            launcher:className="com.google.android.apps.docs.app.NewMainProxyActivity"/>
         <favorite
-            launcher:className="com.google.android.apps.photos.home.HomeActivity"
-            launcher:packageName="com.google.android.apps.photos" />
+            launcher:packageName="com.google.android.music"
+            launcher:className="com.android.music.activitymanagement.TopLevelActivity"/>
         <favorite
-            launcher:className="com.android.calendar.AllInOneActivity"
-            launcher:packageName="com.google.android.calendar" />
+            launcher:packageName="com.google.android.videos"
+            launcher:className="com.google.android.youtube.videos.EntryPoint"/>
         <favorite
-            launcher:className="com.google.android.keep.activities.BrowseActivity"
-            launcher:packageName="com.google.android.keep" />
+            launcher:packageName="com.google.android.apps.photos"
+            launcher:className="com.google.android.apps.photos.home.HomeActivity"/>
     </folder>
 
-    <resolve
+    <favorite
         launcher:screen="0"
         launcher:x="1"
-        launcher:y="-1" >
-        <favorite
-            launcher:className="com.google.android.apps.tachyon.MainActivity"
-            launcher:packageName="com.google.android.apps.tachyon" />
-    </resolve>
+        launcher:y="4"
+        launcher:packageName="com.google.android.apps.tachyon"
+        launcher:className="com.google.android.apps.tachyon.MainActivity"/>
 
-    <resolve
+    <favorite
         launcher:screen="0"
         launcher:x="4"
-        launcher:y="-1">
-        <favorite
-            launcher:packageName="com.android.vending"
-            launcher:className="com.android.vending.AssetBrowserActivity" />
-        <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_MARKET;end" />
-        <favorite launcher:uri="market://details?id=com.android.launcher" />
-    </resolve>
+        launcher:y="4"
+        launcher:packageName="com.android.vending"
+        launcher:className="com.android.vending.AssetBrowserActivity"/>
 
     <!-- Screen 1 -->
     <appwidget
-- 
cgit v1.2.3