From 8361472cd8a682ebeebd32882294c70dd68282dc Mon Sep 17 00:00:00 2001
From: Abhisek Devkota <ciwrl@cyanogenmod.com>
Date: Mon, 2 Nov 2015 11:09:34 -0800
Subject: Update default workspace to GMS 3.0 req

PAELLA-81

Change-Id: If74f7dc1b81e48d00c80b71cef4994d6f5172b59
---
 res/xml/default_workspace_4x4.xml | 21 ++++++---------------
 res/xml/default_workspace_5x5.xml | 21 ++++++---------------
 res/xml/default_workspace_5x6.xml | 23 +++++++----------------
 3 files changed, 19 insertions(+), 46 deletions(-)

diff --git a/res/xml/default_workspace_4x4.xml b/res/xml/default_workspace_4x4.xml
index aab3645da..06019dc68 100644
--- a/res/xml/default_workspace_4x4.xml
+++ b/res/xml/default_workspace_4x4.xml
@@ -49,34 +49,25 @@
         <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" />
         <favorite
             launcher:className="com.google.android.apps.photos.home.HomeActivity"
             launcher:packageName="com.google.android.apps.photos" />
-        <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" />
         <favorite
             launcher:className="com.google.android.apps.wallet.entrypoint.WalletRootActivity"
             launcher:packageName="com.google.android.apps.walletnfcrel" />
-        <favorite
-            launcher:className="com.google.android.apps.genie.geniewidget.activities.NewsActivity"
-            launcher:packageName="com.google.android.apps.genie.geniewidget" />
     </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 b3b064dba..28c229662 100644
--- a/res/xml/default_workspace_5x5.xml
+++ b/res/xml/default_workspace_5x5.xml
@@ -49,34 +49,25 @@
         <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" />
         <favorite
             launcher:className="com.google.android.apps.photos.home.HomeActivity"
             launcher:packageName="com.google.android.apps.photos" />
-        <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" />
         <favorite
             launcher:className="com.google.android.apps.wallet.entrypoint.WalletRootActivity"
             launcher:packageName="com.google.android.apps.walletnfcrel" />
-        <favorite
-            launcher:className="com.google.android.apps.genie.geniewidget.activities.NewsActivity"
-            launcher:packageName="com.google.android.apps.genie.geniewidget" />
     </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 a9c8a6b0e..56103ccfc 100644
--- a/res/xml/default_workspace_5x6.xml
+++ b/res/xml/default_workspace_5x6.xml
@@ -49,34 +49,25 @@
         <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" />
         <favorite
             launcher:className="com.google.android.apps.photos.home.HomeActivity"
             launcher:packageName="com.google.android.apps.photos" />
-        <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" />
         <favorite
             launcher:className="com.google.android.apps.wallet.entrypoint.WalletRootActivity"
             launcher:packageName="com.google.android.apps.walletnfcrel" />
-        <favorite
-            launcher:className="com.google.android.apps.genie.geniewidget.activities.NewsActivity"
-            launcher:packageName="com.google.android.apps.genie.geniewidget" />
     </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" />
@@ -215,4 +206,4 @@
             launcher:className="com.android.camera.CameraLauncher" />
     </resolve>
 
-</favorites>
\ No newline at end of file
+</favorites>
-- 
cgit v1.2.3