Trebuchet : Port default workspace

Port default workspace from cm-10.2

Change-Id: Ia817baef17e2edc8c384d215f2d2cba07dd21be9

13 files changed, 711 insertions, 156 deletions

diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 2bf0b4389..f2cb2f5cf 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -73,4 +73,7 @@
     <string name="default_iconpack_title">Default icons</string>
     <string name="icon_packs_title">Icon packs</string>
     <string name="no_iconpacks_summary">No icon packs installed</string>
+
+    <!-- Folder titles -->
+    <string name="google_title" translatable="false">Google</string>
 </resources>
diff --git a/res/xml-sw600dp/default_workspace.xml b/res/xml-sw600dp/default_workspace.xml
index d5cc6ad1d..15bae7feb 100644
--- a/res/xml-sw600dp/default_workspace.xml
+++ b/res/xml-sw600dp/default_workspace.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 The Android Open Source Project
+<!--
+     Copyright (C) 2013-2014 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.
@@ -13,49 +14,123 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-
-<favorites xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3">
+<favorites xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher3">
     <!-- Far-left screen [0] -->
 
     <!-- Left screen [1] -->
     <appwidget
-        launcher:packageName="com.android.settings"
-        launcher:className="com.android.settings.widget.SettingsAppWidgetProvider"
+        launcher:packageName="com.google.android.music"
+        launcher:className="com.android.music.MediaAppWidgetProvider"
         launcher:screen="1"
-        launcher:x="0"
-        launcher:y="3"
+        launcher:x="1"
+        launcher:y="0"
         launcher:spanX="4"
         launcher:spanY="1" />
+    <appwidget
+        launcher:packageName="com.andrew.apollo"
+        launcher:className="com.andrew.apollo.appwidgets.AppWidgetLarge"
+        launcher:screen="1"
+        launcher:x="1"
+        launcher:y="0"
+        launcher:spanX="4"
+        launcher:spanY="2" />
+    <favorite
+        launcher:packageName="com.bel.android.dspmanager"
+        launcher:className="com.bel.android.dspmanager.activity.DSPManager"
+        launcher:screen="1"
+        launcher:x="1"
+        launcher:y="5" />
+    <favorite
+        launcher:packageName="com.google.android.music"
+        launcher:className="com.android.music.activitymanagement.TopLevelActivity"
+        launcher:screen="1"
+        launcher:x="4"
+        launcher:y="5" />
+    <favorite
+        launcher:packageName="com.andrew.apollo"
+        launcher:className="com.andrew.apollo.ui.activities.HomeActivity"
+        launcher:screen="1"
+        launcher:x="4"
+        launcher:y="5" />
 
     <!-- Middle screen [2] -->
     <appwidget
         launcher:packageName="com.cyanogenmod.lockclock"
         launcher:className="com.cyanogenmod.lockclock.ClockWidgetProvider"
         launcher:screen="2"
-        launcher:x="0"
+        launcher:x="1"
         launcher:y="0"
-        launcher:spanX="3"
+        launcher:spanX="4"
         launcher:spanY="3" />
+    <folder
+        launcher:screen="2"
+        launcher:x="1"
+        launcher:y="5"
+        launcher:title="@string/google_title">
+        <favorite
+            launcher:className="com.google.android.maps.MapsActivity"
+            launcher:packageName="com.google.android.apps.maps" />
+        <favorite
+            launcher:className="com.google.android.gm.GmailActivity"
+            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.android.music.activitymanagement.TopLevelActivity"
+            launcher:packageName="com.google.android.music" />
+        <favorite
+            launcher:className="com.google.android.youtube.app.honeycomb.Shell$HomeActivity"
+            launcher:packageName="com.google.android.youtube" />
+        <favorite
+            launcher:className="com.google.android.talk.SigningInActivity"
+            launcher:packageName="com.google.android.talk" />
+        <favorite
+            launcher:className="com.android.calendar.AllInOneActivity"
+            launcher:packageName="com.google.android.calendar" />
+        <favorite
+            launcher:className="com.google.android.maps.driveabout.app.DestinationActivity"
+            launcher:packageName="com.google.android.apps.maps" />
+        <favorite
+            launcher:className="com.google.android.apps.plus.phone.ConversationListActivity"
+            launcher:packageName="com.google.android.apps.plus" />
+    </folder>
     <favorite
-        launcher:packageName="com.android.camera"
-        launcher:className="com.android.camera.Camera"
+        launcher:packageName="com.android.vending"
+        launcher:className="com.android.vending.AssetBrowserActivity"
         launcher:screen="2"
-        launcher:x="0"
-        launcher:y="3" />
+        launcher:x="4"
+        launcher:y="5" />
 
     <!-- Right screen [3] -->
+    <appwidget
+        launcher:packageName="com.android.vending"
+        launcher:className="com.google.android.finsky.widget.consumption.NowPlayingWidgetProvider"
+        launcher:screen="3"
+        launcher:x="1"
+        launcher:y="0"
+        launcher:spanX="4"
+        launcher:spanY="2" />
+    <appwidget
+        launcher:packageName="com.android.mms"
+        launcher:className="com.android.mms.widget.MmsWidgetProvider"
+        launcher:screen="3"
+        launcher:x="1"
+        launcher:y="0"
+        launcher:spanX="4"
+        launcher:spanY="1" />
     <favorite
         launcher:packageName="com.android.gallery3d"
         launcher:className="com.android.gallery3d.app.Gallery"
         launcher:screen="3"
         launcher:x="1"
-        launcher:y="3" />
+        launcher:y="5" />
     <favorite
         launcher:packageName="com.android.settings"
         launcher:className="com.android.settings.Settings"
         launcher:screen="3"
-        launcher:x="2"
-        launcher:y="3" />
+        launcher:x="4"
+        launcher:y="5" />
 
     <!-- Far-right screen [4] -->
 
@@ -68,15 +143,22 @@
         launcher:x="1"
         launcher:y="0" />
     <favorite
-        launcher:packageName="com.android.contacts"
-        launcher:className="com.android.contacts.activities.PeopleActivity"
+        launcher:packageName="com.android.mms"
+        launcher:className="com.android.mms.ui.ConversationList"
         launcher:container="-101"
         launcher:screen="2"
         launcher:x="2"
         launcher:y="0" />
     <favorite
-        launcher:packageName="com.android.mms"
-        launcher:className="com.android.mms.ui.ConversationList"
+        launcher:packageName="com.android.email"
+        launcher:className="com.android.email.activity.Welcome"
+        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:container="-101"
         launcher:screen="4"
         launcher:x="4"
@@ -85,6 +167,20 @@
         launcher:packageName="com.android.browser"
         launcher:className="com.android.browser.BrowserActivity"
         launcher:container="-101"
+        launcher:screen="4"
+        launcher:x="4"
+        launcher:y="0" />
+    <favorite
+        launcher:packageName="com.android.camera2"
+        launcher:className="com.android.camera.CameraLauncher"
+        launcher:container="-101"
+        launcher:screen="5"
+        launcher:x="5"
+        launcher:y="0" />
+    <favorite
+        launcher:packageName="com.android.gallery3d"
+        launcher:className="com.android.gallery3d.app.GalleryActivity"
+        launcher:container="-101"
         launcher:screen="5"
         launcher:x="5"
         launcher:y="0" />
diff --git a/res/xml-sw600dp/default_workspace_no_telephony.xml b/res/xml-sw600dp/default_workspace_no_telephony.xml
index 233bb1809..96162ef28 100644
--- a/res/xml-sw600dp/default_workspace_no_telephony.xml
+++ b/res/xml-sw600dp/default_workspace_no_telephony.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The CyanogenMod Project
+<!--
+     Copyright (C) 2013-2014 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.
@@ -13,84 +14,174 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-
-<favorites xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet">
+<favorites xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher3">
     <!-- Far-left screen [0] -->
 
     <!-- Left screen [1] -->
     <appwidget
-        launcher:packageName="com.android.settings"
-        launcher:className="com.android.settings.widget.SettingsAppWidgetProvider"
+        launcher:packageName="com.google.android.music"
+        launcher:className="com.android.music.MediaAppWidgetProvider"
         launcher:screen="1"
-        launcher:x="0"
-        launcher:y="3"
+        launcher:x="1"
+        launcher:y="0"
         launcher:spanX="4"
         launcher:spanY="1" />
+    <appwidget
+        launcher:packageName="com.andrew.apollo"
+        launcher:className="com.andrew.apollo.appwidgets.AppWidgetLarge"
+        launcher:screen="1"
+        launcher:x="1"
+        launcher:y="0"
+        launcher:spanX="4"
+        launcher:spanY="2" />
+    <favorite
+        launcher:packageName="com.bel.android.dspmanager"
+        launcher:className="com.bel.android.dspmanager.activity.DSPManager"
+        launcher:screen="1"
+        launcher:x="1"
+        launcher:y="5" />
+    <favorite
+        launcher:packageName="com.google.android.music"
+        launcher:className="com.android.music.activitymanagement.TopLevelActivity"
+        launcher:screen="1"
+        launcher:x="4"
+        launcher:y="5" />
+    <favorite
+        launcher:packageName="com.andrew.apollo"
+        launcher:className="com.andrew.apollo.ui.activities.HomeActivity"
+        launcher:screen="1"
+        launcher:x="4"
+        launcher:y="5" />
 
     <!-- Middle screen [2] -->
     <appwidget
         launcher:packageName="com.cyanogenmod.lockclock"
         launcher:className="com.cyanogenmod.lockclock.ClockWidgetProvider"
         launcher:screen="2"
-        launcher:x="0"
+        launcher:x="1"
         launcher:y="0"
-        launcher:spanX="3"
+        launcher:spanX="4"
         launcher:spanY="3" />
+    <folder
+        launcher:screen="2"
+        launcher:x="1"
+        launcher:y="5"
+        launcher:title="@string/google_title">
+        <favorite
+            launcher:className="com.google.android.maps.MapsActivity"
+            launcher:packageName="com.google.android.apps.maps" />
+        <favorite
+            launcher:className="com.google.android.gm.GmailActivity"
+            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.android.music.activitymanagement.TopLevelActivity"
+            launcher:packageName="com.google.android.music" />
+        <favorite
+            launcher:className="com.google.android.youtube.app.honeycomb.Shell$HomeActivity"
+            launcher:packageName="com.google.android.youtube" />
+        <favorite
+            launcher:className="com.google.android.talk.SigningInActivity"
+            launcher:packageName="com.google.android.talk" />
+        <favorite
+            launcher:className="com.android.calendar.AllInOneActivity"
+            launcher:packageName="com.google.android.calendar" />
+        <favorite
+            launcher:className="com.google.android.maps.driveabout.app.DestinationActivity"
+            launcher:packageName="com.google.android.apps.maps" />
+        <favorite
+            launcher:className="com.google.android.apps.plus.phone.ConversationListActivity"
+            launcher:packageName="com.google.android.apps.plus" />
+    </folder>
     <favorite
-        launcher:packageName="com.android.camera"
-        launcher:className="com.android.camera.Camera"
+        launcher:packageName="com.android.vending"
+        launcher:className="com.android.vending.AssetBrowserActivity"
         launcher:screen="2"
-        launcher:x="0"
-        launcher:y="3" />
+        launcher:x="4"
+        launcher:y="5" />
 
     <!-- Right screen [3] -->
+    <appwidget
+        launcher:packageName="com.android.vending"
+        launcher:className="com.google.android.finsky.widget.consumption.NowPlayingWidgetProvider"
+        launcher:screen="3"
+        launcher:x="1"
+        launcher:y="0"
+        launcher:spanX="4"
+        launcher:spanY="2" />
+    <appwidget
+        launcher:packageName="com.android.settings"
+        launcher:className="com.android.settings.widget.SettingsAppWidgetProvider"
+        launcher:screen="3"
+        launcher:x="1"
+        launcher:y="0"
+        launcher:spanX="4"
+        launcher:spanY="1" />
     <favorite
         launcher:packageName="com.android.gallery3d"
         launcher:className="com.android.gallery3d.app.Gallery"
         launcher:screen="3"
         launcher:x="1"
-        launcher:y="3" />
+        launcher:y="5" />
     <favorite
         launcher:packageName="com.android.settings"
         launcher:className="com.android.settings.Settings"
         launcher:screen="3"
-        launcher:x="2"
-        launcher:y="3" />
+        launcher:x="4"
+        launcher:y="5" />
 
     <!-- Far-right screen [4] -->
 
     <!-- Hotseat (We use the screen as the position of the item in the hotseat) -->
     <favorite
-        launcher:packageName="com.android.email"
-        launcher:className="com.android.email.activity.Welcome"
+        launcher:packageName="com.android.contacts"
+        launcher:className="com.android.contacts.activities.PeopleActivity"
         launcher:container="-101"
-        launcher:screen="0"
+        launcher:screen="1"
         launcher:x="1"
         launcher:y="0" />
     <favorite
-        launcher:packageName="com.android.calendar"
-        launcher:className="com.android.calendar.AllInOneActivity"
+        launcher:packageName="com.google.android.gm"
+        launcher:className="com.google.android.gm.ConversationListActivityGmail"
         launcher:container="-101"
-        launcher:screen="0"
+        launcher:screen="2"
         launcher:x="2"
         launcher:y="0" />
-    <allapps
+    <favorite
+        launcher:packageName="com.android.email"
+        launcher:className="com.android.email.activity.Welcome"
         launcher:container="-101"
-        launcher:screen="0"
-        launcher:x="3"
+        launcher:screen="2"
+        launcher:x="2"
         launcher:y="0" />
     <favorite
-        launcher:packageName="com.android.contacts"
-        launcher:className="com.android.contacts.activities.PeopleActivity"
+        launcher:packageName="com.android.chrome"
+        launcher:className="com.google.android.apps.chrome.Main"
         launcher:container="-101"
-        launcher:screen="0"
+        launcher:screen="4"
         launcher:x="4"
         launcher:y="0" />
     <favorite
         launcher:packageName="com.android.browser"
         launcher:className="com.android.browser.BrowserActivity"
         launcher:container="-101"
-        launcher:screen="0"
+        launcher:screen="4"
+        launcher:x="4"
+        launcher:y="0" />
+    <favorite
+        launcher:packageName="com.android.camera2"
+        launcher:className="com.android.camera.CameraLauncher"
+        launcher:container="-101"
+        launcher:screen="5"
+        launcher:x="5"
+        launcher:y="0" />
+    <favorite
+        launcher:packageName="com.android.gallery3d"
+        launcher:className="com.android.gallery3d.app.GalleryActivity"
+        launcher:container="-101"
+        launcher:screen="5"
         launcher:x="5"
         launcher:y="0" />
 </favorites>
diff --git a/res/xml-sw600dp/update_workspace.xml b/res/xml-sw600dp/update_workspace.xml
index d7056537c..e103a9454 100644
--- a/res/xml-sw600dp/update_workspace.xml
+++ b/res/xml-sw600dp/update_workspace.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The CyanogenMod Project
+<!--
+     Copyright (C) 2013-2014 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.
@@ -13,13 +14,12 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-
-<favorites xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet">
+<favorites xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher3">
     <!-- Update the db with new hotseat all apps button. -->
     <!-- Hotseat (We use the screen as the position of the item in the hotseat) -->
     <favorite
-        launcher:packageName="com.android.contacts"
-        launcher:className="com.android.contacts.activities.DialtactsActivity"
+        launcher:packageName="com.android.dialer"
+        launcher:className="com.android.dialer.DialtactsActivity"
         launcher:container="-101"
         launcher:screen="0"
         launcher:x="1"
diff --git a/res/xml-sw600dp/update_workspace_no_telephony.xml b/res/xml-sw600dp/update_workspace_no_telephony.xml
index cfa0058eb..530e4a5ea 100644
--- a/res/xml-sw600dp/update_workspace_no_telephony.xml
+++ b/res/xml-sw600dp/update_workspace_no_telephony.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The CyanogenMod Project
+<!--
+     Copyright (C) 2013-2014 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.
@@ -13,8 +14,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-
-<favorites xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet">
+<favorites xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher3">
     <!-- Update the db with new hotseat all apps button. -->
     <!-- Hotseat (We use the screen as the position of the item in the hotseat) -->
     <favorite
diff --git a/res/xml-sw720dp/default_workspace.xml b/res/xml-sw720dp/default_workspace.xml
index c5de7b151..15e054b1b 100644
--- a/res/xml-sw720dp/default_workspace.xml
+++ b/res/xml-sw720dp/default_workspace.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
+<!--
+     Copyright (C) 2013-2014 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.
@@ -13,49 +14,167 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-
-<favorites xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3">
+<favorites xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher3">
     <!-- Far-left screen [0] -->
 
     <!-- Left screen [1] -->
     <appwidget
-        launcher:packageName="com.android.settings"
-        launcher:className="com.android.settings.widget.SettingsAppWidgetProvider"
+        launcher:packageName="com.google.android.music"
+        launcher:className="com.android.music.MediaAppWidgetProvider"
         launcher:screen="1"
         launcher:x="0"
-        launcher:y="3"
+        launcher:y="0"
         launcher:spanX="4"
         launcher:spanY="1" />
+    <appwidget
+        launcher:packageName="com.andrew.apollo"
+        launcher:className="com.andrew.apollo.appwidgets.AppWidgetLarge"
+        launcher:screen="1"
+        launcher:x="2"
+        launcher:y="0"
+        launcher:spanX="4"
+        launcher:spanY="2" />
+    <favorite
+        launcher:packageName="com.bel.android.dspmanager"
+        launcher:className="com.bel.android.dspmanager.activity.DSPManager"
+        launcher:screen="1"
+        launcher:x="2"
+        launcher:y="4" />
+    <favorite
+        launcher:packageName="com.google.android.music"
+        launcher:className="com.android.music.activitymanagement.TopLevelActivity"
+        launcher:screen="1"
+        launcher:x="5"
+        launcher:y="4" />
+    <favorite
+        launcher:packageName="com.andrew.apollo"
+        launcher:className="com.andrew.apollo.ui.activities.HomeActivity"
+        launcher:screen="1"
+        launcher:x="5"
+        launcher:y="4" />
 
     <!-- Middle screen [2] -->
     <appwidget
         launcher:packageName="com.cyanogenmod.lockclock"
         launcher:className="com.cyanogenmod.lockclock.ClockWidgetProvider"
         launcher:screen="2"
-        launcher:x="0"
+        launcher:x="2"
         launcher:y="0"
-        launcher:spanX="3"
-        launcher:spanY="4" />
+        launcher:spanX="4"
+        launcher:spanY="3" />
+    <folder
+        launcher:screen="2"
+        launcher:x="2"
+        launcher:y="4"
+        launcher:title="@string/google_title">
+        <favorite
+            launcher:className="com.google.android.maps.MapsActivity"
+            launcher:packageName="com.google.android.apps.maps" />
+        <favorite
+            launcher:className="com.google.android.gm.GmailActivity"
+            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.android.music.activitymanagement.TopLevelActivity"
+            launcher:packageName="com.google.android.music" />
+        <favorite
+            launcher:className="com.google.android.youtube.app.honeycomb.Shell$HomeActivity"
+            launcher:packageName="com.google.android.youtube" />
+        <favorite
+            launcher:className="com.google.android.talk.SigningInActivity"
+            launcher:packageName="com.google.android.talk" />
+        <favorite
+            launcher:className="com.android.calendar.AllInOneActivity"
+            launcher:packageName="com.google.android.calendar" />
+        <favorite
+            launcher:className="com.google.android.maps.driveabout.app.DestinationActivity"
+            launcher:packageName="com.google.android.apps.maps" />
+        <favorite
+            launcher:className="com.google.android.apps.plus.phone.ConversationListActivity"
+            launcher:packageName="com.google.android.apps.plus" />
+    </folder>
     <favorite
-        launcher:packageName="com.android.camera"
-        launcher:className="com.android.camera.Camera"
+        launcher:packageName="com.android.vending"
+        launcher:className="com.android.vending.AssetBrowserActivity"
         launcher:screen="2"
-        launcher:x="0"
-        launcher:y="3" />
+        launcher:x="5"
+        launcher:y="4" />
 
     <!-- Right screen [3] -->
+    <appwidget
+        launcher:packageName="com.android.vending"
+        launcher:className="com.google.android.finsky.widget.consumption.NowPlayingWidgetProvider"
+        launcher:screen="3"
+        launcher:x="2"
+        launcher:y="0"
+        launcher:spanX="4"
+        launcher:spanY="2" />
+    <appwidget
+        launcher:packageName="com.android.mms"
+        launcher:className="com.android.mms.widget.MmsWidgetProvider"
+        launcher:screen="3"
+        launcher:x="2"
+        launcher:y="0"
+        launcher:spanX="4"
+        launcher:spanY="2" />
     <favorite
         launcher:packageName="com.android.gallery3d"
         launcher:className="com.android.gallery3d.app.Gallery"
         launcher:screen="3"
-        launcher:x="1"
-        launcher:y="3" />
+        launcher:x="2"
+        launcher:y="4" />
     <favorite
         launcher:packageName="com.android.settings"
         launcher:className="com.android.settings.Settings"
         launcher:screen="3"
-        launcher:x="2"
-        launcher:y="3" />
+        launcher:x="5"
+        launcher:y="4" />
 
     <!-- Far-right screen [4] -->
+
+    <!-- Hotseat (We use the screen as the position of the item in the hotseat) -->
+    <favorite
+        launcher:packageName="com.android.dialer"
+        launcher:className="com.android.contacts.dialer.DialtactsActivity"
+        launcher:container="-101"
+        launcher:screen="2"
+        launcher:x="2"
+        launcher:y="0" />
+    <favorite
+        launcher:packageName="com.google.android.gm"
+        launcher:className="com.google.android.gm.ConversationListActivityGmail"
+        launcher:container="-101"
+        launcher:screen="3"
+        launcher:x="3"
+        launcher:y="0" />
+    <favorite
+        launcher:packageName="com.android.mms"
+        launcher:className="com.android.mms.ui.ConversationList"
+        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:container="-101"
+        launcher:screen="5"
+        launcher:x="5"
+        launcher:y="0" />
+    <favorite
+        launcher:packageName="com.android.browser"
+        launcher:className="com.android.browser.BrowserActivity"
+        launcher:container="-101"
+        launcher:screen="5"
+        launcher:x="5"
+        launcher:y="0" />
+    <favorite
+        launcher:packageName="com.android.camera2"
+        launcher:className="com.android.camera.CameraLauncher"
+        launcher:container="-101"
+        launcher:screen="6"
+        launcher:x="6"
+        launcher:y="0" />
 </favorites>
diff --git a/res/xml-sw720dp/default_workspace_no_telephony.xml b/res/xml-sw720dp/default_workspace_no_telephony.xml
index 34f8af445..7f6799089 100644
--- a/res/xml-sw720dp/default_workspace_no_telephony.xml
+++ b/res/xml-sw720dp/default_workspace_no_telephony.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The CyanogenMod Project
+<!--
+     Copyright (C) 2013-2014 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.
@@ -13,84 +14,167 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-
-<favorites xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet">
+<favorites xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher3">
     <!-- Far-left screen [0] -->
 
     <!-- Left screen [1] -->
     <appwidget
-        launcher:packageName="com.android.settings"
-        launcher:className="com.android.settings.widget.SettingsAppWidgetProvider"
+        launcher:packageName="com.google.android.music"
+        launcher:className="com.android.music.MediaAppWidgetProvider"
         launcher:screen="1"
         launcher:x="0"
-        launcher:y="3"
+        launcher:y="0"
         launcher:spanX="4"
         launcher:spanY="1" />
+    <appwidget
+        launcher:packageName="com.andrew.apollo"
+        launcher:className="com.andrew.apollo.appwidgets.AppWidgetLarge"
+        launcher:screen="1"
+        launcher:x="2"
+        launcher:y="0"
+        launcher:spanX="4"
+        launcher:spanY="2" />
+    <favorite
+        launcher:packageName="com.bel.android.dspmanager"
+        launcher:className="com.bel.android.dspmanager.activity.DSPManager"
+        launcher:screen="1"
+        launcher:x="2"
+        launcher:y="4" />
+    <favorite
+        launcher:packageName="com.google.android.music"
+        launcher:className="com.android.music.activitymanagement.TopLevelActivity"
+        launcher:screen="1"
+        launcher:x="5"
+        launcher:y="4" />
+    <favorite
+        launcher:packageName="com.andrew.apollo"
+        launcher:className="com.andrew.apollo.ui.activities.HomeActivity"
+        launcher:screen="1"
+        launcher:x="5"
+        launcher:y="4" />
 
     <!-- Middle screen [2] -->
     <appwidget
         launcher:packageName="com.cyanogenmod.lockclock"
         launcher:className="com.cyanogenmod.lockclock.ClockWidgetProvider"
         launcher:screen="2"
-        launcher:x="0"
+        launcher:x="2"
         launcher:y="0"
-        launcher:spanX="3"
-        launcher:spanY="4" />
+        launcher:spanX="4"
+        launcher:spanY="3" />
+    <folder
+        launcher:screen="2"
+        launcher:x="2"
+        launcher:y="4"
+        launcher:title="@string/google_title">
+        <favorite
+            launcher:className="com.google.android.maps.MapsActivity"
+            launcher:packageName="com.google.android.apps.maps" />
+        <favorite
+            launcher:className="com.google.android.gm.GmailActivity"
+            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.android.music.activitymanagement.TopLevelActivity"
+            launcher:packageName="com.google.android.music" />
+        <favorite
+            launcher:className="com.google.android.youtube.app.honeycomb.Shell$HomeActivity"
+            launcher:packageName="com.google.android.youtube" />
+        <favorite
+            launcher:className="com.google.android.talk.SigningInActivity"
+            launcher:packageName="com.google.android.talk" />
+        <favorite
+            launcher:className="com.android.calendar.AllInOneActivity"
+            launcher:packageName="com.google.android.calendar" />
+        <favorite
+            launcher:className="com.google.android.maps.driveabout.app.DestinationActivity"
+            launcher:packageName="com.google.android.apps.maps" />
+        <favorite
+            launcher:className="com.google.android.apps.plus.phone.ConversationListActivity"
+            launcher:packageName="com.google.android.apps.plus" />
+    </folder>
     <favorite
-        launcher:packageName="com.android.camera"
-        launcher:className="com.android.camera.Camera"
+        launcher:packageName="com.android.vending"
+        launcher:className="com.android.vending.AssetBrowserActivity"
         launcher:screen="2"
-        launcher:x="0"
-        launcher:y="3" />
+        launcher:x="5"
+        launcher:y="4" />
 
     <!-- Right screen [3] -->
+    <appwidget
+        launcher:packageName="com.android.vending"
+        launcher:className="com.google.android.finsky.widget.consumption.NowPlayingWidgetProvider"
+        launcher:screen="3"
+        launcher:x="2"
+        launcher:y="0"
+        launcher:spanX="4"
+        launcher:spanY="2" />
+    <appwidget
+        launcher:packageName="com.android.settings"
+        launcher:className="com.android.settings.widget.SettingsAppWidgetProvider"
+        launcher:screen="3"
+        launcher:x="2"
+        launcher:y="0"
+        launcher:spanX="4"
+        launcher:spanY="1" />
     <favorite
         launcher:packageName="com.android.gallery3d"
         launcher:className="com.android.gallery3d.app.Gallery"
         launcher:screen="3"
-        launcher:x="1"
-        launcher:y="3" />
+        launcher:x="2"
+        launcher:y="4" />
     <favorite
         launcher:packageName="com.android.settings"
         launcher:className="com.android.settings.Settings"
         launcher:screen="3"
-        launcher:x="2"
-        launcher:y="3" />
+        launcher:x="5"
+        launcher:y="4" />
 
     <!-- Far-right screen [4] -->
 
     <!-- Hotseat (We use the screen as the position of the item in the hotseat) -->
     <favorite
-        launcher:packageName="com.android.email"
-        launcher:className="com.android.email.activity.Welcome"
+        launcher:packageName="com.android.contacts"
+        launcher:className="com.android.contacts.activities.PeopleActivity"
         launcher:container="-101"
-        launcher:screen="0"
+        launcher:screen="2"
         launcher:x="2"
         launcher:y="0" />
     <favorite
-        launcher:packageName="com.android.calendar"
-        launcher:className="com.android.calendar.AllInOneActivity"
+        launcher:packageName="com.google.android.gm"
+        launcher:className="com.google.android.gm.ConversationListActivityGmail"
         launcher:container="-101"
-        launcher:screen="0"
+        launcher:screen="3"
         launcher:x="3"
         launcher:y="0" />
-    <allapps
+    <favorite
+        launcher:packageName="com.android.email"
+        launcher:className="com.android.email.activity.Welcome"
         launcher:container="-101"
-        launcher:screen="0"
-        launcher:x="4"
+        launcher:screen="3"
+        launcher:x="3"
         launcher:y="0" />
     <favorite
-        launcher:packageName="com.android.contacts"
-        launcher:className="com.android.contacts.activities.PeopleActivity"
+        launcher:packageName="com.android.chrome"
+        launcher:className="com.google.android.apps.chrome.Main"
         launcher:container="-101"
-        launcher:screen="0"
+        launcher:screen="5"
         launcher:x="5"
         launcher:y="0" />
     <favorite
         launcher:packageName="com.android.browser"
         launcher:className="com.android.browser.BrowserActivity"
         launcher:container="-101"
-        launcher:screen="0"
+        launcher:screen="5"
+        launcher:x="5"
+        launcher:y="0" />
+    <favorite
+        launcher:packageName="com.android.camera2"
+        launcher:className="com.android.camera.CameraLauncher"
+        launcher:container="-101"
+        launcher:screen="6"
         launcher:x="6"
         launcher:y="0" />
 </favorites>
diff --git a/res/xml-sw720dp/update_workspace.xml b/res/xml-sw720dp/update_workspace.xml
index 1962389cb..05748bed7 100644
--- a/res/xml-sw720dp/update_workspace.xml
+++ b/res/xml-sw720dp/update_workspace.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The CyanogenMod Project
+<!--
+     Copyright (C) 2013-2014 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.
@@ -13,13 +14,12 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-
-<favorites xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet">
+<favorites xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher3">
     <!-- Update the db with new hotseat all apps button. -->
     <!-- Hotseat (We use the screen as the position of the item in the hotseat) -->
     <favorite
-        launcher:packageName="com.android.contacts"
-        launcher:className="com.android.contacts.activities.DialtactsActivity"
+        launcher:packageName="com.android.dialer"
+        launcher:className="com.android.dialer.DialtactsActivity"
         launcher:container="-101"
         launcher:screen="0"
         launcher:x="2"
diff --git a/res/xml-sw720dp/update_workspace_no_telephony.xml b/res/xml-sw720dp/update_workspace_no_telephony.xml
index d01697eea..d677a49ed 100644
--- a/res/xml-sw720dp/update_workspace_no_telephony.xml
+++ b/res/xml-sw720dp/update_workspace_no_telephony.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The CyanogenMod Project
+<!--
+     Copyright (C) 2013-2014 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.
@@ -13,8 +14,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-
-<favorites xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet">
+<favorites xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher3">
     <!-- Update the db with new hotseat all apps button. -->
     <!-- Hotseat (We use the screen as the position of the item in the hotseat) -->
     <favorite
diff --git a/res/xml/default_workspace.xml b/res/xml/default_workspace.xml
index d530fe3b3..bc2d2342a 100644
--- a/res/xml/default_workspace.xml
+++ b/res/xml/default_workspace.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
+<!--
+     Copyright (C) 2013-2014 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.
@@ -13,19 +14,44 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-
-<favorites xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3">
+<favorites xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher3">
     <!-- Far-left screen [0] -->
 
     <!-- Left screen [1] -->
     <appwidget
-        launcher:packageName="com.android.settings"
-        launcher:className="com.android.settings.widget.SettingsAppWidgetProvider"
+        launcher:packageName="com.google.android.music"
+        launcher:className="com.android.music.MediaAppWidgetProvider"
+        launcher:screen="1"
+        launcher:x="0"
+        launcher:y="0"
+        launcher:spanX="4"
+        launcher:spanY="1" />
+    <appwidget
+        launcher:packageName="com.andrew.apollo"
+        launcher:className="com.andrew.apollo.appwidgets.AppWidgetSmall"
         launcher:screen="1"
         launcher:x="0"
-        launcher:y="3"
+        launcher:y="0"
         launcher:spanX="4"
         launcher:spanY="1" />
+    <favorite
+        launcher:packageName="com.bel.android.dspmanager"
+        launcher:className="com.bel.android.dspmanager.activity.DSPManager"
+        launcher:screen="1"
+        launcher:x="1"
+        launcher:y="3" />
+    <favorite
+        launcher:packageName="com.google.android.music"
+        launcher:className="com.android.music.activitymanagement.TopLevelActivity"
+        launcher:screen="1"
+        launcher:x="2"
+        launcher:y="3" />
+    <favorite
+        launcher:packageName="com.andrew.apollo"
+        launcher:className="com.andrew.apollo.ui.activities.HomeActivity"
+        launcher:screen="1"
+        launcher:x="2"
+        launcher:y="3" />
 
     <!-- Middle screen [2] -->
     <appwidget
@@ -34,16 +60,61 @@
         launcher:screen="2"
         launcher:x="0"
         launcher:y="0"
-        launcher:spanX="3"
+        launcher:spanX="4"
         launcher:spanY="2" />
+    <folder launcher:screen="2" launcher:x="0" launcher:y="3" launcher:title="@string/google_title">
+        <favorite
+            launcher:className="com.google.android.maps.MapsActivity"
+            launcher:packageName="com.google.android.apps.maps" />
+        <favorite
+            launcher:className="com.google.android.gm.GmailActivity"
+            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.android.music.activitymanagement.TopLevelActivity"
+            launcher:packageName="com.google.android.music" />
+        <favorite
+            launcher:className="com.google.android.youtube.app.honeycomb.Shell$HomeActivity"
+            launcher:packageName="com.google.android.youtube" />
+        <favorite
+            launcher:className="com.google.android.talk.SigningInActivity"
+            launcher:packageName="com.google.android.talk" />
+        <favorite
+            launcher:className="com.android.calendar.AllInOneActivity"
+            launcher:packageName="com.google.android.calendar" />
+        <favorite
+            launcher:className="com.google.android.maps.driveabout.app.DestinationActivity"
+            launcher:packageName="com.google.android.apps.maps" />
+        <favorite
+            launcher:className="com.google.android.apps.plus.phone.ConversationListActivity"
+            launcher:packageName="com.google.android.apps.plus" />
+    </folder>
     <favorite
-        launcher:packageName="com.android.camera"
-        launcher:className="com.android.camera.Camera"
+        launcher:packageName="com.android.vending"
+        launcher:className="com.android.vending.AssetBrowserActivity"
         launcher:screen="2"
-        launcher:x="0"
+        launcher:x="3"
         launcher:y="3" />
 
     <!-- Right screen [3] -->
+    <appwidget
+        launcher:packageName="com.android.vending"
+        launcher:className="com.google.android.finsky.widget.consumption.NowPlayingWidgetProvider"
+        launcher:screen="3"
+        launcher:x="0"
+        launcher:y="0"
+        launcher:spanX="4"
+        launcher:spanY="2" />
+    <appwidget
+        launcher:packageName="com.android.mms"
+        launcher:className="com.android.mms.widget.MmsWidgetProvider"
+        launcher:screen="3"
+        launcher:x="0"
+        launcher:y="0"
+        launcher:spanX="4"
+        launcher:spanY="2" />
     <favorite
         launcher:packageName="com.android.gallery3d"
         launcher:className="com.android.gallery3d.app.Gallery"
@@ -68,15 +139,15 @@
         launcher:x="0"
         launcher:y="0" />
     <favorite
-        launcher:packageName="com.android.contacts"
-        launcher:className="com.android.contacts.activities.PeopleActivity"
+        launcher:packageName="com.android.mms"
+        launcher:className="com.android.mms.ui.ConversationList"
         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"
+        launcher:packageName="com.android.chrome"
+        launcher:className="com.google.android.apps.chrome.Main"
         launcher:container="-101"
         launcher:screen="3"
         launcher:x="3"
@@ -85,6 +156,13 @@
         launcher:packageName="com.android.browser"
         launcher:className="com.android.browser.BrowserActivity"
         launcher:container="-101"
+        launcher:screen="3"
+        launcher:x="3"
+        launcher:y="0" />
+    <favorite
+        launcher:packageName="com.android.camera2"
+        launcher:className="com.android.camera.CameraLauncher"
+        launcher:container="-101"
         launcher:screen="4"
         launcher:x="4"
         launcher:y="0" />
diff --git a/res/xml/default_workspace_no_telephony.xml b/res/xml/default_workspace_no_telephony.xml
index 0e376cfc6..d0eda9cf3 100644
--- a/res/xml/default_workspace_no_telephony.xml
+++ b/res/xml/default_workspace_no_telephony.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The CyanogenMod Project
+<!--
+     Copyright (C) 2013-2014 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.
@@ -13,19 +14,44 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-
-<favorites xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet">
+<favorites xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher3">
     <!-- Far-left screen [0] -->
 
     <!-- Left screen [1] -->
     <appwidget
-        launcher:packageName="com.android.settings"
-        launcher:className="com.android.settings.widget.SettingsAppWidgetProvider"
+        launcher:packageName="com.google.android.music"
+        launcher:className="com.android.music.MediaAppWidgetProvider"
         launcher:screen="1"
         launcher:x="0"
-        launcher:y="3"
+        launcher:y="0"
         launcher:spanX="4"
         launcher:spanY="1" />
+    <appwidget
+        launcher:packageName="com.andrew.apollo"
+        launcher:className="com.andrew.apollo.appwidgets.AppWidgetSmall"
+        launcher:screen="1"
+        launcher:x="0"
+        launcher:y="0"
+        launcher:spanX="4"
+        launcher:spanY="1" />
+    <favorite
+        launcher:packageName="com.bel.android.dspmanager"
+        launcher:className="com.bel.android.dspmanager.activity.DSPManager"
+        launcher:screen="1"
+        launcher:x="1"
+        launcher:y="3" />
+    <favorite
+        launcher:packageName="com.google.android.music"
+        launcher:className="com.android.music.activitymanagement.TopLevelActivity"
+        launcher:screen="1"
+        launcher:x="2"
+        launcher:y="3" />
+    <favorite
+        launcher:packageName="com.andrew.apollo"
+        launcher:className="com.andrew.apollo.ui.activities.HomeActivity"
+        launcher:screen="1"
+        launcher:x="2"
+        launcher:y="3" />
 
     <!-- Middle screen [2] -->
     <appwidget
@@ -34,16 +60,61 @@
         launcher:screen="2"
         launcher:x="0"
         launcher:y="0"
-        launcher:spanX="3"
+        launcher:spanX="4"
         launcher:spanY="2" />
+    <folder launcher:screen="2" launcher:x="0" launcher:y="3" launcher:title="@string/google_title">
+        <favorite
+            launcher:className="com.google.android.maps.MapsActivity"
+            launcher:packageName="com.google.android.apps.maps" />
+        <favorite
+            launcher:className="com.google.android.gm.GmailActivity"
+            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.android.music.activitymanagement.TopLevelActivity"
+            launcher:packageName="com.google.android.music" />
+        <favorite
+            launcher:className="com.google.android.youtube.app.honeycomb.Shell$HomeActivity"
+            launcher:packageName="com.google.android.youtube" />
+        <favorite
+            launcher:className="com.google.android.talk.SigningInActivity"
+            launcher:packageName="com.google.android.talk" />
+        <favorite
+            launcher:className="com.android.calendar.AllInOneActivity"
+            launcher:packageName="com.google.android.calendar" />
+        <favorite
+            launcher:className="com.google.android.maps.driveabout.app.DestinationActivity"
+            launcher:packageName="com.google.android.apps.maps" />
+        <favorite
+            launcher:className="com.google.android.apps.plus.phone.ConversationListActivity"
+            launcher:packageName="com.google.android.apps.plus" />
+    </folder>
     <favorite
-        launcher:packageName="com.android.camera"
-        launcher:className="com.android.camera.Camera"
+        launcher:packageName="com.android.vending"
+        launcher:className="com.android.vending.AssetBrowserActivity"
         launcher:screen="2"
-        launcher:x="0"
+        launcher:x="3"
         launcher:y="3" />
 
     <!-- Right screen [3] -->
+    <appwidget
+        launcher:packageName="com.android.vending"
+        launcher:className="com.google.android.finsky.widget.consumption.NowPlayingWidgetProvider"
+        launcher:screen="3"
+        launcher:x="0"
+        launcher:y="0"
+        launcher:spanX="4"
+        launcher:spanY="2" />
+    <appwidget
+        launcher:packageName="com.android.settings"
+        launcher:className="com.android.settings.widget.SettingsAppWidgetProvider"
+        launcher:screen="3"
+        launcher:x="0"
+        launcher:y="0"
+        launcher:spanX="4"
+        launcher:spanY="1" />
     <favorite
         launcher:packageName="com.android.gallery3d"
         launcher:className="com.android.gallery3d.app.Gallery"
@@ -61,27 +132,29 @@
 
     <!-- Hotseat (We use the screen as the position of the item in the hotseat) -->
     <favorite
-        launcher:packageName="com.android.email"
-        launcher:className="com.android.email.activity.Welcome"
+        launcher:packageName="com.android.contacts"
+        launcher:className="com.android.contacts.activities.PeopleActivity"
         launcher:container="-101"
         launcher:screen="0"
         launcher:x="0"
         launcher:y="0" />
     <favorite
-        launcher:packageName="com.android.calendar"
-        launcher:className="com.android.calendar.AllInOneActivity"
+        launcher:packageName="com.google.android.gm"
+        launcher:className="com.google.android.gm.ConversationListActivityGmail"
         launcher:container="-101"
-        launcher:screen="0"
+        launcher:screen="1"
         launcher:x="1"
         launcher:y="0" />
-    <allapps
+    <favorite
+        launcher:packageName="com.android.email"
+        launcher:className="com.android.email.activity.Welcome"
         launcher:container="-101"
-        launcher:screen="0"
-        launcher:x="2"
+        launcher:screen="3"
+        launcher:x="1"
         launcher:y="0" />
     <favorite
-        launcher:packageName="com.android.contacts"
-        launcher:className="com.android.contacts.activities.PeopleActivity"
+        launcher:packageName="com.android.chrome"
+        launcher:className="com.google.android.apps.chrome.Main"
         launcher:container="-101"
         launcher:screen="0"
         launcher:x="3"
@@ -90,7 +163,14 @@
         launcher:packageName="com.android.browser"
         launcher:className="com.android.browser.BrowserActivity"
         launcher:container="-101"
-        launcher:screen="0"
+        launcher:screen="4"
+        launcher:x="3"
+        launcher:y="0" />
+    <favorite
+        launcher:packageName="com.android.camera2"
+        launcher:className="com.android.camera.CameraLauncher"
+        launcher:container="-101"
+        launcher:screen="4"
         launcher:x="4"
         launcher:y="0" />
 </favorites>
diff --git a/res/xml/update_workspace.xml b/res/xml/update_workspace.xml
index 38442b91c..5112def33 100644
--- a/res/xml/update_workspace.xml
+++ b/res/xml/update_workspace.xml
@@ -14,9 +14,8 @@
      limitations under the License.
 -->
 
-<favorites xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3">
-    <!-- Update the db with new hotseat items.  Note that we reference the browser's original
-         package name. -->
+<favorites xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher3">
+    <!-- Update the db with new hotseat all apps button. -->
     <!-- Hotseat (We use the screen as the position of the item in the hotseat) -->
     <favorite
         launcher:packageName="com.android.dialer"
@@ -29,21 +28,26 @@
         launcher:packageName="com.android.contacts"
         launcher:className="com.android.contacts.activities.PeopleActivity"
         launcher:container="-101"
-        launcher:screen="1"
+        launcher:screen="0"
         launcher:x="1"
         launcher:y="0" />
+    <allapps
+        launcher:container="-101"
+        launcher:screen="0"
+        launcher:x="2"
+        launcher:y="0" />
     <favorite
         launcher:packageName="com.android.mms"
         launcher:className="com.android.mms.ui.ConversationList"
         launcher:container="-101"
-        launcher:screen="3"
+        launcher:screen="0"
         launcher:x="3"
         launcher:y="0" />
     <favorite
         launcher:packageName="com.android.browser"
         launcher:className="com.android.browser.BrowserActivity"
         launcher:container="-101"
-        launcher:screen="4"
+        launcher:screen="0"
         launcher:x="4"
         launcher:y="0" />
 </favorites>
diff --git a/res/xml/update_workspace_no_telephony.xml b/res/xml/update_workspace_no_telephony.xml
index 84c014ae0..22fa6578a 100644
--- a/res/xml/update_workspace_no_telephony.xml
+++ b/res/xml/update_workspace_no_telephony.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The CyanogenMod Project
+<!--
+     Copyright (C) 2013-2014 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.
@@ -13,8 +14,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-
-<favorites xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet">
+<favorites xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher3">
     <!-- Update the db with new hotseat all apps button. -->
     <!-- Hotseat (We use the screen as the position of the item in the hotseat) -->
     <favorite