From 2d723e272e080f0ea63ebb1c6c139c1ae05513c2 Mon Sep 17 00:00:00 2001
From: Abhisek Devkota <ciwrl@cyanogenmod.com>
Date: Mon, 2 Nov 2015 15:31:32 -0800
Subject: GMS 3.0 : Update optional apps and folders

CYNGNOS-1284

Change-Id: I62550df160cd40d77692d42f01ab11e27823b217
---
 res/xml/default_workspace_4x4.xml | 18 ++++++++++++------
 res/xml/default_workspace_5x5.xml | 18 ++++++++++++------
 res/xml/default_workspace_5x6.xml | 18 ++++++++++++------
 3 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/res/xml/default_workspace_4x4.xml b/res/xml/default_workspace_4x4.xml
index 06019dc68..5970f12f4 100644
--- a/res/xml/default_workspace_4x4.xml
+++ b/res/xml/default_workspace_4x4.xml
@@ -49,12 +49,6 @@
         <favorite
             launcher:className="com.google.android.apps.docs.app.NewMainProxyActivity"
             launcher:packageName="com.google.android.apps.docs" />
-        <favorite
-            launcher:className="com.android.music.activitymanagement.TopLevelActivity"
-            launcher:packageName="com.google.android.music" />
-        <favorite
-            launcher:className="com.google.android.youtube.videos.EntryPoint"
-            launcher:packageName="com.google.android.videos" />
         <favorite
             launcher:className="com.google.android.talk.SigningInActivity"
             launcher:packageName="com.google.android.talk" />
@@ -64,10 +58,22 @@
         <favorite
             launcher:className="com.google.android.apps.wallet.entrypoint.WalletRootActivity"
             launcher:packageName="com.google.android.apps.walletnfcrel" />
+        <favorite
+            launcher:className="com.android.calendar.AllInOneActivity"
+            launcher:packageName="com.google.android.calendar" />
+        <favorite
+            launcher:className="com.google.android.apps.plus.phone.HomeActivity"
+            launcher:packageName="com.google.android.apps.plus" />
     </folder>
 
     <!-- Play Folder -->
     <folder launcher:screen="1" launcher:x="1" launcher:y="3" launcher:title="@string/play_folder_title">
+        <favorite
+            launcher:className="com.android.music.activitymanagement.TopLevelActivity"
+            launcher:packageName="com.google.android.music" />
+        <favorite
+            launcher:className="com.google.android.youtube.videos.EntryPoint"
+            launcher:packageName="com.google.android.videos" />
         <favorite
             launcher:className="com.google.android.gms.games.ui.destination.main.MainActivity"
             launcher:packageName="com.google.android.play.games" />
diff --git a/res/xml/default_workspace_5x5.xml b/res/xml/default_workspace_5x5.xml
index 28c229662..5839438f6 100644
--- a/res/xml/default_workspace_5x5.xml
+++ b/res/xml/default_workspace_5x5.xml
@@ -49,12 +49,6 @@
         <favorite
             launcher:className="com.google.android.apps.docs.app.NewMainProxyActivity"
             launcher:packageName="com.google.android.apps.docs" />
-        <favorite
-            launcher:className="com.android.music.activitymanagement.TopLevelActivity"
-            launcher:packageName="com.google.android.music" />
-        <favorite
-            launcher:className="com.google.android.youtube.videos.EntryPoint"
-            launcher:packageName="com.google.android.videos" />
         <favorite
             launcher:className="com.google.android.talk.SigningInActivity"
             launcher:packageName="com.google.android.talk" />
@@ -64,10 +58,22 @@
         <favorite
             launcher:className="com.google.android.apps.wallet.entrypoint.WalletRootActivity"
             launcher:packageName="com.google.android.apps.walletnfcrel" />
+        <favorite
+            launcher:className="com.android.calendar.AllInOneActivity"
+            launcher:packageName="com.google.android.calendar" />
+        <favorite
+            launcher:className="com.google.android.apps.plus.phone.HomeActivity"
+            launcher:packageName="com.google.android.apps.plus" />
     </folder>
 
     <!-- Play Folder -->
     <folder launcher:screen="1" launcher:x="1" launcher:y="4" launcher:title="@string/play_folder_title">
+        <favorite
+            launcher:className="com.android.music.activitymanagement.TopLevelActivity"
+            launcher:packageName="com.google.android.music" />
+        <favorite
+            launcher:className="com.google.android.youtube.videos.EntryPoint"
+            launcher:packageName="com.google.android.videos" />
         <favorite
             launcher:className="com.google.android.gms.games.ui.destination.main.MainActivity"
             launcher:packageName="com.google.android.play.games" />
diff --git a/res/xml/default_workspace_5x6.xml b/res/xml/default_workspace_5x6.xml
index 56103ccfc..81a1ef701 100644
--- a/res/xml/default_workspace_5x6.xml
+++ b/res/xml/default_workspace_5x6.xml
@@ -49,12 +49,6 @@
         <favorite
             launcher:className="com.google.android.apps.docs.app.NewMainProxyActivity"
             launcher:packageName="com.google.android.apps.docs" />
-        <favorite
-            launcher:className="com.android.music.activitymanagement.TopLevelActivity"
-            launcher:packageName="com.google.android.music" />
-        <favorite
-            launcher:className="com.google.android.youtube.videos.EntryPoint"
-            launcher:packageName="com.google.android.videos" />
         <favorite
             launcher:className="com.google.android.talk.SigningInActivity"
             launcher:packageName="com.google.android.talk" />
@@ -64,10 +58,22 @@
         <favorite
             launcher:className="com.google.android.apps.wallet.entrypoint.WalletRootActivity"
             launcher:packageName="com.google.android.apps.walletnfcrel" />
+        <favorite
+            launcher:className="com.android.calendar.AllInOneActivity"
+            launcher:packageName="com.google.android.calendar" />
+        <favorite
+            launcher:className="com.google.android.apps.plus.phone.HomeActivity"
+            launcher:packageName="com.google.android.apps.plus" />
     </folder>
 
     <!-- Play Folder -->
     <folder launcher:screen="1" launcher:x="1" launcher:y="4" launcher:title="@string/play_folder_title">
+        <favorite
+            launcher:className="com.android.music.activitymanagement.TopLevelActivity"
+            launcher:packageName="com.google.android.music" />
+        <favorite
+            launcher:className="com.google.android.youtube.videos.EntryPoint"
+            launcher:packageName="com.google.android.videos" />
         <favorite
             launcher:className="com.google.android.gms.games.ui.destination.main.MainActivity"
             launcher:packageName="com.google.android.play.games" />
-- 
cgit v1.2.3