Update default workspace.

- Add additional Gapps (if present)
- Shuffle some things around.
- Remove Google Music widget that overlapped the Eleven widget.

Change-Id: I8d3d7cb4f2984942804f6dd016253294d0a70968

6 files changed, 626 insertions, 200 deletions

diff --git a/res/xml/default_workspace_4x4.xml b/res/xml/default_workspace_4x4.xml
index ac2af79a5..dc821e592 100644
--- a/res/xml/default_workspace_4x4.xml
+++ b/res/xml/default_workspace_4x4.xml
@@ -18,6 +18,8 @@
     <!-- Far-left screen [0] -->
 
     <!-- Left screen [1] -->
+
+    <!-- Clock Widget -->
     <appwidget
         launcher:packageName="com.cyanogenmod.lockclock"
         launcher:className="com.cyanogenmod.lockclock.ClockWidgetProvider"
@@ -27,23 +29,39 @@
         launcher:spanX="4"
         launcher:spanY="2" />
 
+    <!-- Google Folder -->
     <folder launcher:screen="1" launcher:x="0" launcher:y="3" 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" />
         <favorite
-            launcher:className="com.google.android.apps.plus.phone.HomeActivity"
-            launcher:packageName="com.google.android.apps.plus" />
-        <favorite
             launcher:className="com.google.android.maps.MapsActivity"
             launcher:packageName="com.google.android.apps.maps" />
         <favorite
+            launcher:className="com.google.android.youtube.app.honeycomb.Shell$HomeActivity"
+            launcher:packageName="com.google.android.youtube" />
+        <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.plus.phone.ConversationListActivity"
+            launcher:packageName="com.google.android.apps.plus" />
+        <favorite
+            launcher:className="com.android.calendar.AllInOneActivity"
+            launcher:packageName="com.google.android.calendar"/>
+        <favorite
             launcher:className="com.google.android.apps.books.app.BooksActivity"
             launcher:packageName="com.google.android.apps.books" />
         <favorite
@@ -53,50 +71,51 @@
             launcher:className="com.google.android.gms.games.ui.destination.main.MainActivity"
             launcher:packageName="com.google.android.play.games" />
         <favorite
-            launcher:className="com.google.android.apps.docs.app.NewMainProxyActivity"
-            launcher:packageName="com.google.android.apps.docs" />
-        <favorite
-            launcher:className="com.google.android.youtube.app.honeycomb.Shell$HomeActivity"
-            launcher:packageName="com.google.android.youtube" />
-        <favorite
-            launcher:className="com.google.android.apps.plus.phone.ConversationListActivity"
+            launcher:className="com.google.android.apps.plus.phone.HomeActivity"
             launcher:packageName="com.google.android.apps.plus" />
         <favorite
-            launcher:className="com.google.android.talk.SigningInActivity"
-            launcher:packageName="com.google.android.talk" />
+            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>
 
     <favorite
         launcher:packageName="com.cyanogenmod.eleven"
         launcher:className="com.cyanogenmod.eleven.ui.activities.HomeActivity"
         launcher:screen="1"
-        launcher:x="0"
+        launcher:x="1"
         launcher:y="3" />
 
+    <!-- Gallery -->
     <resolve
         launcher:screen="1"
-        launcher:x="3"
+        launcher:x="2"
         launcher:y="3" >
         <favorite
-            launcher:packageName="com.android.vending"
-            launcher:className="com.android.vending.AssetBrowserActivity" />
+            launcher:packageName="com.cyngn.gallerynext"
+            launcher:className="com.cyngn.gallerynext.app.GalleryActivity" />
+        <favorite
+            launcher:packageName="com.android.gallery3d"
+            launcher:className="com.android.gallery3d.app.GalleryActivity" />
+    </resolve>
+
+    <resolve
+        launcher:screen="1"
+        launcher:x="3"
+        launcher:y="3" >
         <favorite
             launcher:packageName="org.cyanogenmod.theme.chooser"
             launcher:className="org.cyanogenmod.theme.chooser.ChooserActivity" />
+        <favorite
+            launcher:packageName="com.android.vending"
+            launcher:className="com.android.vending.AssetBrowserActivity" />
     </resolve>
 
     <!-- Screen [2] -->
 
     <appwidget
-        launcher:packageName="com.android.vending"
-        launcher:className="com.google.android.finsky.widget.consumption.NowPlayingWidgetProvider"
-        launcher:screen="2"
-        launcher:x="0"
-        launcher:y="0"
-        launcher:spanX="4"
-        launcher:spanY="2" />
-
-    <appwidget
         launcher:packageName="com.cyanogenmod.eleven"
         launcher:className="com.cyanogenmod.eleven.appwidgets.AppWidgetLarge"
         launcher:screen="2"
@@ -105,18 +124,6 @@
         launcher:spanX="4"
         launcher:spanY="2" />
 
-    <resolve
-        launcher:screen="2"
-        launcher:x="0"
-        launcher:y="3" >
-        <favorite
-            launcher:packageName="com.cyngn.gallerynext"
-            launcher:className="com.cyngn.gallerynext.app.GalleryActivity" />
-        <favorite
-            launcher:packageName="com.android.gallery3d"
-            launcher:className="com.android.gallery3d.app.GalleryActivity" />
-    </resolve>
-
     <favorite
         launcher:packageName="com.android.settings"
         launcher:className="com.android.settings.Settings"
@@ -125,7 +132,7 @@
         launcher:y="3" />
 
     <!-- Hotseat (We use the screen as the position of the item in the hotseat) -->
-    <!-- Dialer, Contacts, [All Apps], Messaging, Browser -->
+    <!-- Dialer, Messaging, [All Apps], Browser, Camera -->
     <resolve
         launcher:container="-101"
         launcher:screen="0"
@@ -182,4 +189,4 @@
             launcher:className="com.android.camera.CameraLauncher" />
     </resolve>
 
-</favorites>
\ No newline at end of file
+</favorites>
diff --git a/res/xml/default_workspace_4x4_no_all_apps.xml b/res/xml/default_workspace_4x4_no_all_apps.xml
index 7e1301cef..4e21d0304 100644
--- a/res/xml/default_workspace_4x4_no_all_apps.xml
+++ b/res/xml/default_workspace_4x4_no_all_apps.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
+<!-- Copyright (C) 2015 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -15,42 +15,179 @@
 -->
 
 <favorites xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3">
-    <!-- Hotseat (We use the screen as the position of the item in the hotseat) -->
-    <!-- Dialer Hangouts Maps Chrome Camera -->
+    <!-- Far-left screen [0] -->
+
+    <!-- Left screen [1] -->
+
+    <!-- Clock Widget -->
+    <appwidget
+        launcher:packageName="com.cyanogenmod.lockclock"
+        launcher:className="com.cyanogenmod.lockclock.ClockWidgetProvider"
+        launcher:screen="1"
+        launcher:x="0"
+        launcher:y="0"
+        launcher:spanX="4"
+        launcher:spanY="2" />
+
+    <!-- Google Folder -->
+    <folder launcher:screen="1" launcher:x="0" launcher:y="3" 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" />
+        <favorite
+            launcher:className="com.google.android.maps.MapsActivity"
+            launcher:packageName="com.google.android.apps.maps" />
+        <favorite
+            launcher:className="com.google.android.youtube.app.honeycomb.Shell$HomeActivity"
+            launcher:packageName="com.google.android.youtube" />
+        <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.plus.phone.ConversationListActivity"
+            launcher:packageName="com.google.android.apps.plus" />
+        <favorite
+            launcher:className="com.android.calendar.AllInOneActivity"
+            launcher:packageName="com.google.android.calendar"/>
+        <favorite
+            launcher:className="com.google.android.apps.books.app.BooksActivity"
+            launcher:packageName="com.google.android.apps.books" />
+        <favorite
+            launcher:className="com.google.apps.dots.android.app.activity.CurrentsStartActivity"
+            launcher:packageName="com.google.android.apps.magazines" />
+        <favorite
+            launcher:className="com.google.android.gms.games.ui.destination.main.MainActivity"
+            launcher:packageName="com.google.android.play.games" />
+        <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>
+
+    <favorite
+        launcher:packageName="com.cyanogenmod.eleven"
+        launcher:className="com.cyanogenmod.eleven.ui.activities.HomeActivity"
+        launcher:screen="1"
+        launcher:x="1"
+        launcher:y="3" />
+
+    <!-- Gallery -->
+    <resolve
+        launcher:screen="1"
+        launcher:x="2"
+        launcher:y="3" >
+        <favorite
+            launcher:packageName="com.cyngn.gallerynext"
+            launcher:className="com.cyngn.gallerynext.app.GalleryActivity" />
+        <favorite
+            launcher:packageName="com.android.gallery3d"
+            launcher:className="com.android.gallery3d.app.GalleryActivity" />
+    </resolve>
+
+    <resolve
+        launcher:screen="1"
+        launcher:x="3"
+        launcher:y="3" >
+        <favorite
+            launcher:packageName="org.cyanogenmod.theme.chooser"
+            launcher:className="org.cyanogenmod.theme.chooser.ChooserActivity" />
+        <favorite
+            launcher:packageName="com.android.vending"
+            launcher:className="com.android.vending.AssetBrowserActivity" />
+    </resolve>
+
+    <!-- Screen [2] -->
+
+    <appwidget
+        launcher:packageName="com.cyanogenmod.eleven"
+        launcher:className="com.cyanogenmod.eleven.appwidgets.AppWidgetLarge"
+        launcher:screen="2"
+        launcher:x="0"
+        launcher:y="0"
+        launcher:spanX="4"
+        launcher:spanY="2" />
+
     <favorite
-        launcher:packageName="com.google.android.dialer"
-        launcher:className="com.google.android.dialer.extensions.GoogleDialtactsActivity"
+        launcher:packageName="com.android.settings"
+        launcher:className="com.android.settings.Settings"
+        launcher:screen="2"
+        launcher:x="3"
+        launcher:y="3" />
+
+    <!-- Hotseat (We use the screen as the position of the item in the hotseat) -->
+    <!-- Dialer, Messaging, [All Apps], Browser, Camera -->
+    <resolve
         launcher:container="-101"
         launcher:screen="0"
         launcher:x="0"
-        launcher:y="0" />
-    <favorite
-        launcher:packageName="com.google.android.talk"
-        launcher:className="com.google.android.talk.SigningInActivity"
+        launcher:y="0" >
+        <favorite launcher:uri="#Intent;action=android.intent.action.DIAL;end" />
+        <favorite launcher:uri="tel:123" />
+        <favorite launcher:uri="#Intent;action=android.intent.action.CALL_BUTTON;end" />
+
+        <favorite
+            launcher:packageName="com.android.dialer"
+            launcher:className="com.android.dialer.DialtactsActivity" />
+        <favorite
+            launcher:packageName="com.android.contacts"
+            launcher:className="com.android.contacts.activities.PeopleActivity" />
+    </resolve>
+
+    <resolve
         launcher:container="-101"
         launcher:screen="1"
         launcher:x="1"
-        launcher:y="0" />
-    <favorite
-        launcher:packageName="com.google.android.apps.maps"
-        launcher:className="com.google.android.maps.MapsActivity"
-        launcher:container="-101"
-        launcher:screen="2"
-        launcher:x="2"
-        launcher:y="0"/>
-    <favorite
-        launcher:packageName="com.android.chrome"
-        launcher:className="com.google.android.apps.chrome.Main"
+        launcher:y="0" >
+        <favorite
+            launcher:packageName="com.android.mms"
+            launcher:className="com.android.mms.ui.ConversationList" />
+        <favorite
+            launcher:packageName="com.android.email"
+            launcher:className="com.android.email.activity.Welcome" />
+    </resolve>
+
+    <resolve
         launcher:container="-101"
         launcher:screen="3"
-        launcher:x="3"
-        launcher:y="0" />
-    <favorite
-        launcher:packageName="com.google.android.GoogleCamera"
-        launcher:className="com.android.camera.CameraLauncher"
+        launcher:x="2"
+        launcher:y="0" >
+        <favorite
+            launcher:packageName="com.android.chrome"
+            launcher:className="com.google.android.apps.chrome.Main" />
+        <favorite
+            launcher:packageName="com.android.browser"
+            launcher:className="com.android.browser.BrowserActivity" />
+    </resolve>
+
+    <resolve
         launcher:container="-101"
         launcher:screen="4"
-        launcher:x="4"
-        launcher:y="0" />
+        launcher:x="3"
+        launcher:y="0" >
+        <favorite
+            launcher:packageName="com.cyngn.cameranext"
+            launcher:className="com.android.camera.CameraLauncher" />
+        <favorite
+            launcher:packageName="com.android.camera2"
+            launcher:className="com.android.camera.CameraLauncher" />
+    </resolve>
+
 </favorites>
 
diff --git a/res/xml/default_workspace_5x5.xml b/res/xml/default_workspace_5x5.xml
index 1d41e3f27..4a6f5d689 100644
--- a/res/xml/default_workspace_5x5.xml
+++ b/res/xml/default_workspace_5x5.xml
@@ -18,6 +18,8 @@
     <!-- Far-left screen [0] -->
 
     <!-- Left screen [1] -->
+
+    <!-- Clock Widget -->
     <appwidget
         launcher:packageName="com.cyanogenmod.lockclock"
         launcher:className="com.cyanogenmod.lockclock.ClockWidgetProvider"
@@ -27,23 +29,39 @@
         launcher:spanX="5"
         launcher:spanY="2" />
 
+    <!-- Google Folder -->
     <folder launcher:screen="1" launcher:x="0" launcher:y="4" 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" />
         <favorite
-            launcher:className="com.google.android.apps.plus.phone.HomeActivity"
-            launcher:packageName="com.google.android.apps.plus" />
-        <favorite
             launcher:className="com.google.android.maps.MapsActivity"
             launcher:packageName="com.google.android.apps.maps" />
         <favorite
+            launcher:className="com.google.android.youtube.app.honeycomb.Shell$HomeActivity"
+            launcher:packageName="com.google.android.youtube" />
+        <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.plus.phone.ConversationListActivity"
+            launcher:packageName="com.google.android.apps.plus" />
+        <favorite
+            launcher:className="com.android.calendar.AllInOneActivity"
+            launcher:packageName="com.google.android.calendar"/>
+        <favorite
             launcher:className="com.google.android.apps.books.app.BooksActivity"
             launcher:packageName="com.google.android.apps.books" />
         <favorite
@@ -53,50 +71,50 @@
             launcher:className="com.google.android.gms.games.ui.destination.main.MainActivity"
             launcher:packageName="com.google.android.play.games" />
         <favorite
-            launcher:className="com.google.android.apps.docs.app.NewMainProxyActivity"
-            launcher:packageName="com.google.android.apps.docs" />
-        <favorite
-            launcher:className="com.google.android.youtube.app.honeycomb.Shell$HomeActivity"
-            launcher:packageName="com.google.android.youtube" />
-        <favorite
-            launcher:className="com.google.android.apps.plus.phone.ConversationListActivity"
+            launcher:className="com.google.android.apps.plus.phone.HomeActivity"
             launcher:packageName="com.google.android.apps.plus" />
         <favorite
-            launcher:className="com.google.android.talk.SigningInActivity"
-            launcher:packageName="com.google.android.talk" />
+            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>
 
     <favorite
         launcher:packageName="com.cyanogenmod.eleven"
         launcher:className="com.cyanogenmod.eleven.ui.activities.HomeActivity"
         launcher:screen="1"
-        launcher:x="0"
+        launcher:x="1"
         launcher:y="4" />
 
     <resolve
         launcher:screen="1"
-        launcher:x="4"
+        launcher:x="2"
         launcher:y="4" >
         <favorite
-            launcher:packageName="com.android.vending"
-            launcher:className="com.android.vending.AssetBrowserActivity" />
+            launcher:packageName="com.cyngn.gallerynext"
+            launcher:className="com.cyngn.gallerynext.app.GalleryActivity" />
+        <favorite
+            launcher:packageName="com.android.gallery3d"
+            launcher:className="com.android.gallery3d.app.GalleryActivity" />
+    </resolve>
+
+    <resolve
+        launcher:screen="1"
+        launcher:x="3"
+        launcher:y="4" >
         <favorite
             launcher:packageName="org.cyanogenmod.theme.chooser"
             launcher:className="org.cyanogenmod.theme.chooser.ChooserActivity" />
+        <favorite
+            launcher:packageName="com.android.vending"
+            launcher:className="com.android.vending.AssetBrowserActivity" />
     </resolve>
 
     <!-- Screen [2] -->
 
     <appwidget
-        launcher:packageName="com.android.vending"
-        launcher:className="com.google.android.finsky.widget.consumption.NowPlayingWidgetProvider"
-        launcher:screen="2"
-        launcher:x="0"
-        launcher:y="0"
-        launcher:spanX="5"
-        launcher:spanY="2" />
-
-    <appwidget
         launcher:packageName="com.cyanogenmod.eleven"
         launcher:className="com.cyanogenmod.eleven.appwidgets.AppWidgetLarge"
         launcher:screen="2"
@@ -105,18 +123,6 @@
         launcher:spanX="5"
         launcher:spanY="2" />
 
-    <resolve
-        launcher:screen="2"
-        launcher:x="0"
-        launcher:y="4" >
-        <favorite
-            launcher:packageName="com.cyngn.gallerynext"
-            launcher:className="com.cyngn.gallerynext.app.GalleryActivity" />
-        <favorite
-            launcher:packageName="com.android.gallery3d"
-            launcher:className="com.android.gallery3d.app.GalleryActivity" />
-    </resolve>
-
     <favorite
         launcher:packageName="com.android.settings"
         launcher:className="com.android.settings.Settings"
@@ -125,7 +131,7 @@
         launcher:y="4" />
 
     <!-- Hotseat (We use the screen as the position of the item in the hotseat) -->
-    <!-- Dialer, Contacts, [All Apps], Messaging, Browser -->
+    <!-- Dialer, Messaging, [All Apps], Browser, Camera -->
     <resolve
         launcher:container="-101"
         launcher:screen="0"
diff --git a/res/xml/default_workspace_5x5_no_all_apps.xml b/res/xml/default_workspace_5x5_no_all_apps.xml
index f54a20425..5bf3bc69e 100644
--- a/res/xml/default_workspace_5x5_no_all_apps.xml
+++ b/res/xml/default_workspace_5x5_no_all_apps.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
+<!-- Copyright (C) 2015 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -15,42 +15,177 @@
 -->
 
 <favorites xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3">
-    <!-- Hotseat (We use the screen as the position of the item in the hotseat) -->
-    <!-- Dialer Hangouts Maps Chrome Camera -->
+    <!-- Far-left screen [0] -->
+
+    <!-- Left screen [1] -->
+
+    <!-- Clock Widget -->
+    <appwidget
+        launcher:packageName="com.cyanogenmod.lockclock"
+        launcher:className="com.cyanogenmod.lockclock.ClockWidgetProvider"
+        launcher:screen="1"
+        launcher:x="0"
+        launcher:y="0"
+        launcher:spanX="5"
+        launcher:spanY="2" />
+
+    <!-- Google Folder -->
+    <folder launcher:screen="1" launcher:x="0" launcher:y="4" 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" />
+        <favorite
+            launcher:className="com.google.android.maps.MapsActivity"
+            launcher:packageName="com.google.android.apps.maps" />
+        <favorite
+            launcher:className="com.google.android.youtube.app.honeycomb.Shell$HomeActivity"
+            launcher:packageName="com.google.android.youtube" />
+        <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.plus.phone.ConversationListActivity"
+            launcher:packageName="com.google.android.apps.plus" />
+        <favorite
+            launcher:className="com.android.calendar.AllInOneActivity"
+            launcher:packageName="com.google.android.calendar"/>
+        <favorite
+            launcher:className="com.google.android.apps.books.app.BooksActivity"
+            launcher:packageName="com.google.android.apps.books" />
+        <favorite
+            launcher:className="com.google.apps.dots.android.app.activity.CurrentsStartActivity"
+            launcher:packageName="com.google.android.apps.magazines" />
+        <favorite
+            launcher:className="com.google.android.gms.games.ui.destination.main.MainActivity"
+            launcher:packageName="com.google.android.play.games" />
+        <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>
+
     <favorite
-        launcher:packageName="com.google.android.dialer"
-        launcher:className="com.google.android.dialer.extensions.GoogleDialtactsActivity"
-        launcher:container="-101"
+        launcher:packageName="com.cyanogenmod.eleven"
+        launcher:className="com.cyanogenmod.eleven.ui.activities.HomeActivity"
         launcher:screen="1"
         launcher:x="1"
-        launcher:y="0" />
-    <favorite
-        launcher:packageName="com.google.android.talk"
-        launcher:className="com.google.android.talk.SigningInActivity"
-        launcher:container="-101"
-        launcher:screen="2"
+        launcher:y="4" />
+
+    <resolve
+        launcher:screen="1"
         launcher:x="2"
-        launcher:y="0" />
+        launcher:y="4" >
+        <favorite
+            launcher:packageName="com.cyngn.gallerynext"
+            launcher:className="com.cyngn.gallerynext.app.GalleryActivity" />
+        <favorite
+            launcher:packageName="com.android.gallery3d"
+            launcher:className="com.android.gallery3d.app.GalleryActivity" />
+    </resolve>
+
+    <resolve
+        launcher:screen="1"
+        launcher:x="3"
+        launcher:y="4" >
+        <favorite
+            launcher:packageName="org.cyanogenmod.theme.chooser"
+            launcher:className="org.cyanogenmod.theme.chooser.ChooserActivity" />
+        <favorite
+            launcher:packageName="com.android.vending"
+            launcher:className="com.android.vending.AssetBrowserActivity" />
+    </resolve>
+
+    <!-- Screen [2] -->
+
+    <appwidget
+        launcher:packageName="com.cyanogenmod.eleven"
+        launcher:className="com.cyanogenmod.eleven.appwidgets.AppWidgetLarge"
+        launcher:screen="2"
+        launcher:x="0"
+        launcher:y="0"
+        launcher:spanX="5"
+        launcher:spanY="2" />
+
     <favorite
-        launcher:packageName="com.google.android.apps.maps"
-        launcher:className="com.google.android.maps.MapsActivity"
+        launcher:packageName="com.android.settings"
+        launcher:className="com.android.settings.Settings"
+        launcher:screen="2"
+        launcher:x="4"
+        launcher:y="4" />
+
+    <!-- Hotseat (We use the screen as the position of the item in the hotseat) -->
+    <!-- Dialer, Messaging, [All Apps], Browser, Camera -->
+    <resolve
+        launcher:container="-101"
+        launcher:screen="0"
+        launcher:x="0"
+        launcher:y="0" >
+        <favorite launcher:uri="#Intent;action=android.intent.action.DIAL;end" />
+        <favorite launcher:uri="tel:123" />
+        <favorite launcher:uri="#Intent;action=android.intent.action.CALL_BUTTON;end" />
+
+        <favorite
+            launcher:packageName="com.android.dialer"
+            launcher:className="com.android.dialer.DialtactsActivity" />
+        <favorite
+            launcher:packageName="com.android.contacts"
+            launcher:className="com.android.contacts.activities.PeopleActivity" />
+    </resolve>
+
+    <resolve
+        launcher:container="-101"
+        launcher:screen="1"
+        launcher:x="1"
+        launcher:y="0" >
+        <favorite
+            launcher:packageName="com.android.mms"
+            launcher:className="com.android.mms.ui.ConversationList" />
+        <favorite
+            launcher:packageName="com.android.email"
+            launcher:className="com.android.email.activity.Welcome" />
+    </resolve>
+
+    <resolve
         launcher:container="-101"
         launcher:screen="3"
-        launcher:x="3"
-        launcher:y="0"/>
-    <favorite
-        launcher:packageName="com.android.chrome"
-        launcher:className="com.google.android.apps.chrome.Main"
+        launcher:x="2"
+        launcher:y="0" >
+        <favorite
+            launcher:packageName="com.android.chrome"
+            launcher:className="com.google.android.apps.chrome.Main" />
+        <favorite
+            launcher:packageName="com.android.browser"
+            launcher:className="com.android.browser.BrowserActivity" />
+    </resolve>
+
+    <resolve
         launcher:container="-101"
         launcher:screen="4"
-        launcher:x="4"
-        launcher:y="0" />
-    <favorite
-        launcher:packageName="com.google.android.GoogleCamera"
-        launcher:className="com.android.camera.CameraLauncher"
-        launcher:container="-101"
-        launcher:screen="5"
-        launcher:x="5"
-        launcher:y="0" />
-</favorites>
+        launcher:x="3"
+        launcher:y="0" >
+        <favorite
+            launcher:packageName="com.cyngn.cameranext"
+            launcher:className="com.android.camera.CameraLauncher" />
+        <favorite
+            launcher:packageName="com.android.camera2"
+            launcher:className="com.android.camera.CameraLauncher" />
+    </resolve>
 
+</favorites>
\ No newline at end of file
diff --git a/res/xml/default_workspace_5x6.xml b/res/xml/default_workspace_5x6.xml
index 2892991cd..a086d4a98 100644
--- a/res/xml/default_workspace_5x6.xml
+++ b/res/xml/default_workspace_5x6.xml
@@ -18,6 +18,8 @@
     <!-- Far-left screen [0] -->
 
     <!-- Left screen [1] -->
+
+    <!-- Clock Widget -->
     <appwidget
         launcher:packageName="com.cyanogenmod.lockclock"
         launcher:className="com.cyanogenmod.lockclock.ClockWidgetProvider"
@@ -27,23 +29,39 @@
         launcher:spanX="6"
         launcher:spanY="2" />
 
+    <!-- Google Folder -->
     <folder launcher:screen="1" launcher:x="0" launcher:y="4" 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" />
         <favorite
-            launcher:className="com.google.android.apps.plus.phone.HomeActivity"
-            launcher:packageName="com.google.android.apps.plus" />
-        <favorite
             launcher:className="com.google.android.maps.MapsActivity"
             launcher:packageName="com.google.android.apps.maps" />
         <favorite
+            launcher:className="com.google.android.youtube.app.honeycomb.Shell$HomeActivity"
+            launcher:packageName="com.google.android.youtube" />
+        <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.plus.phone.ConversationListActivity"
+            launcher:packageName="com.google.android.apps.plus" />
+        <favorite
+            launcher:className="com.android.calendar.AllInOneActivity"
+            launcher:packageName="com.google.android.calendar"/>
+        <favorite
             launcher:className="com.google.android.apps.books.app.BooksActivity"
             launcher:packageName="com.google.android.apps.books" />
         <favorite
@@ -53,50 +71,50 @@
             launcher:className="com.google.android.gms.games.ui.destination.main.MainActivity"
             launcher:packageName="com.google.android.play.games" />
         <favorite
-            launcher:className="com.google.android.apps.docs.app.NewMainProxyActivity"
-            launcher:packageName="com.google.android.apps.docs" />
-        <favorite
-            launcher:className="com.google.android.youtube.app.honeycomb.Shell$HomeActivity"
-            launcher:packageName="com.google.android.youtube" />
-        <favorite
-            launcher:className="com.google.android.apps.plus.phone.ConversationListActivity"
+            launcher:className="com.google.android.apps.plus.phone.HomeActivity"
             launcher:packageName="com.google.android.apps.plus" />
         <favorite
-            launcher:className="com.google.android.talk.SigningInActivity"
-            launcher:packageName="com.google.android.talk" />
+            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>
 
     <favorite
         launcher:packageName="com.cyanogenmod.eleven"
         launcher:className="com.cyanogenmod.eleven.ui.activities.HomeActivity"
         launcher:screen="1"
-        launcher:x="0"
+        launcher:x="1"
         launcher:y="4" />
 
     <resolve
         launcher:screen="1"
-        launcher:x="5"
+        launcher:x="4"
         launcher:y="4" >
         <favorite
-            launcher:packageName="com.android.vending"
-            launcher:className="com.android.vending.AssetBrowserActivity" />
+            launcher:packageName="com.cyngn.gallerynext"
+            launcher:className="com.cyngn.gallerynext.app.GalleryActivity" />
+        <favorite
+            launcher:packageName="com.android.gallery3d"
+            launcher:className="com.android.gallery3d.app.GalleryActivity" />
+    </resolve>
+
+    <resolve
+        launcher:screen="1"
+        launcher:x="5"
+        launcher:y="4" >
         <favorite
             launcher:packageName="org.cyanogenmod.theme.chooser"
             launcher:className="org.cyanogenmod.theme.chooser.ChooserActivity" />
+        <favorite
+            launcher:packageName="com.android.vending"
+            launcher:className="com.android.vending.AssetBrowserActivity" />
     </resolve>
 
     <!-- Screen [2] -->
 
     <appwidget
-        launcher:packageName="com.android.vending"
-        launcher:className="com.google.android.finsky.widget.consumption.NowPlayingWidgetProvider"
-        launcher:screen="2"
-        launcher:x="0"
-        launcher:y="0"
-        launcher:spanX="6"
-        launcher:spanY="2" />
-
-    <appwidget
         launcher:packageName="com.cyanogenmod.eleven"
         launcher:className="com.cyanogenmod.eleven.appwidgets.AppWidgetLarge"
         launcher:screen="2"
@@ -105,18 +123,6 @@
         launcher:spanX="6"
         launcher:spanY="2" />
 
-    <resolve
-        launcher:screen="2"
-        launcher:x="0"
-        launcher:y="4" >
-        <favorite
-            launcher:packageName="com.cyngn.gallerynext"
-            launcher:className="com.cyngn.gallerynext.app.GalleryActivity" />
-        <favorite
-            launcher:packageName="com.android.gallery3d"
-            launcher:className="com.android.gallery3d.app.GalleryActivity" />
-    </resolve>
-
     <favorite
         launcher:packageName="com.android.settings"
         launcher:className="com.android.settings.Settings"
@@ -125,7 +131,7 @@
         launcher:y="4" />
 
     <!-- Hotseat (We use the screen as the position of the item in the hotseat) -->
-    <!-- Dialer, Contacts, [All Apps], Messaging, Browser -->
+    <!-- Dialer, Messaging, [All Apps], Browser, Camera -->
     <resolve
         launcher:container="-101"
         launcher:screen="1"
diff --git a/res/xml/default_workspace_5x6_no_all_apps.xml b/res/xml/default_workspace_5x6_no_all_apps.xml
index f54a20425..ba4b8e247 100644
--- a/res/xml/default_workspace_5x6_no_all_apps.xml
+++ b/res/xml/default_workspace_5x6_no_all_apps.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
+<!-- Copyright (C) 2015 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -15,42 +15,177 @@
 -->
 
 <favorites xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3">
-    <!-- Hotseat (We use the screen as the position of the item in the hotseat) -->
-    <!-- Dialer Hangouts Maps Chrome Camera -->
+    <!-- Far-left screen [0] -->
+
+    <!-- Left screen [1] -->
+
+    <!-- Clock Widget -->
+    <appwidget
+        launcher:packageName="com.cyanogenmod.lockclock"
+        launcher:className="com.cyanogenmod.lockclock.ClockWidgetProvider"
+        launcher:screen="1"
+        launcher:x="0"
+        launcher:y="0"
+        launcher:spanX="6"
+        launcher:spanY="2" />
+
+    <!-- Google Folder -->
+    <folder launcher:screen="1" launcher:x="0" launcher:y="4" 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" />
+        <favorite
+            launcher:className="com.google.android.maps.MapsActivity"
+            launcher:packageName="com.google.android.apps.maps" />
+        <favorite
+            launcher:className="com.google.android.youtube.app.honeycomb.Shell$HomeActivity"
+            launcher:packageName="com.google.android.youtube" />
+        <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.plus.phone.ConversationListActivity"
+            launcher:packageName="com.google.android.apps.plus" />
+        <favorite
+            launcher:className="com.android.calendar.AllInOneActivity"
+            launcher:packageName="com.google.android.calendar"/>
+        <favorite
+            launcher:className="com.google.android.apps.books.app.BooksActivity"
+            launcher:packageName="com.google.android.apps.books" />
+        <favorite
+            launcher:className="com.google.apps.dots.android.app.activity.CurrentsStartActivity"
+            launcher:packageName="com.google.android.apps.magazines" />
+        <favorite
+            launcher:className="com.google.android.gms.games.ui.destination.main.MainActivity"
+            launcher:packageName="com.google.android.play.games" />
+        <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>
+
     <favorite
-        launcher:packageName="com.google.android.dialer"
-        launcher:className="com.google.android.dialer.extensions.GoogleDialtactsActivity"
-        launcher:container="-101"
+        launcher:packageName="com.cyanogenmod.eleven"
+        launcher:className="com.cyanogenmod.eleven.ui.activities.HomeActivity"
         launcher:screen="1"
         launcher:x="1"
-        launcher:y="0" />
+        launcher:y="4" />
+
+    <resolve
+        launcher:screen="1"
+        launcher:x="4"
+        launcher:y="4" >
+        <favorite
+            launcher:packageName="com.cyngn.gallerynext"
+            launcher:className="com.cyngn.gallerynext.app.GalleryActivity" />
+        <favorite
+            launcher:packageName="com.android.gallery3d"
+            launcher:className="com.android.gallery3d.app.GalleryActivity" />
+    </resolve>
+
+    <resolve
+        launcher:screen="1"
+        launcher:x="5"
+        launcher:y="4" >
+        <favorite
+            launcher:packageName="org.cyanogenmod.theme.chooser"
+            launcher:className="org.cyanogenmod.theme.chooser.ChooserActivity" />
+        <favorite
+            launcher:packageName="com.android.vending"
+            launcher:className="com.android.vending.AssetBrowserActivity" />
+    </resolve>
+
+    <!-- Screen [2] -->
+
+    <appwidget
+        launcher:packageName="com.cyanogenmod.eleven"
+        launcher:className="com.cyanogenmod.eleven.appwidgets.AppWidgetLarge"
+        launcher:screen="2"
+        launcher:x="0"
+        launcher:y="0"
+        launcher:spanX="6"
+        launcher:spanY="2" />
+
     <favorite
-        launcher:packageName="com.google.android.talk"
-        launcher:className="com.google.android.talk.SigningInActivity"
+        launcher:packageName="com.android.settings"
+        launcher:className="com.android.settings.Settings"
+        launcher:screen="2"
+        launcher:x="5"
+        launcher:y="4" />
+
+    <!-- Hotseat (We use the screen as the position of the item in the hotseat) -->
+    <!-- Dialer, Messaging, [All Apps], Browser, Camera -->
+    <resolve
+        launcher:container="-101"
+        launcher:screen="1"
+        launcher:x="1"
+        launcher:y="0" >
+        <favorite launcher:uri="#Intent;action=android.intent.action.DIAL;end" />
+        <favorite launcher:uri="tel:123" />
+        <favorite launcher:uri="#Intent;action=android.intent.action.CALL_BUTTON;end" />
+
+        <favorite
+            launcher:packageName="com.android.dialer"
+            launcher:className="com.android.dialer.DialtactsActivity" />
+        <favorite
+            launcher:packageName="com.android.contacts"
+            launcher:className="com.android.contacts.activities.PeopleActivity" />
+    </resolve>
+
+    <resolve
         launcher:container="-101"
         launcher:screen="2"
         launcher:x="2"
-        launcher:y="0" />
-    <favorite
-        launcher:packageName="com.google.android.apps.maps"
-        launcher:className="com.google.android.maps.MapsActivity"
-        launcher:container="-101"
-        launcher:screen="3"
-        launcher:x="3"
-        launcher:y="0"/>
-    <favorite
-        launcher:packageName="com.android.chrome"
-        launcher:className="com.google.android.apps.chrome.Main"
+        launcher:y="0" >
+        <favorite
+            launcher:packageName="com.android.mms"
+            launcher:className="com.android.mms.ui.ConversationList" />
+        <favorite
+            launcher:packageName="com.android.email"
+            launcher:className="com.android.email.activity.Welcome" />
+    </resolve>
+
+    <resolve
         launcher:container="-101"
         launcher:screen="4"
-        launcher:x="4"
-        launcher:y="0" />
-    <favorite
-        launcher:packageName="com.google.android.GoogleCamera"
-        launcher:className="com.android.camera.CameraLauncher"
+        launcher:x="5"
+        launcher:y="0" >
+        <favorite
+            launcher:packageName="com.android.chrome"
+            launcher:className="com.google.android.apps.chrome.Main" />
+        <favorite
+            launcher:packageName="com.android.browser"
+            launcher:className="com.android.browser.BrowserActivity" />
+    </resolve>
+
+    <resolve
         launcher:container="-101"
         launcher:screen="5"
-        launcher:x="5"
-        launcher:y="0" />
-</favorites>
+        launcher:x="6"
+        launcher:y="0" >
+        <favorite
+            launcher:packageName="com.cyngn.cameranext"
+            launcher:className="com.android.camera.CameraLauncher" />
+        <favorite
+            launcher:packageName="com.android.camera2"
+            launcher:className="com.android.camera.CameraLauncher" />
+    </resolve>
 
+</favorites>
\ No newline at end of file