From 5caab3f9e2d8f23c2825a73d760dbc1d61b4af9c Mon Sep 17 00:00:00 2001
From: Danesh M <daneshm90@gmail.com>
Date: Thu, 31 Oct 2013 17:07:12 -0700
Subject: Trebuchet : Refresh out of box experience

Change-Id: I1b98dd07e7f9b4266dd94a79bb8f669dd19f5a08
---
 res/xml-sw600dp/default_workspace.xml              | 122 +++++++++++++++++---
 res/xml-sw600dp/default_workspace_no_telephony.xml | 124 ++++++++++++++++++---
 res/xml-sw720dp/default_workspace.xml              | 117 ++++++++++++++++---
 res/xml-sw720dp/default_workspace_no_telephony.xml | 117 ++++++++++++++++---
 res/xml/default_workspace.xml                      |  98 ++++++++++++++--
 res/xml/default_workspace_no_telephony.xml         | 107 ++++++++++++++++--
 6 files changed, 609 insertions(+), 76 deletions(-)

diff --git a/res/xml-sw600dp/default_workspace.xml b/res/xml-sw600dp/default_workspace.xml
index 052115e25..7b831feca 100644
--- a/res/xml-sw600dp/default_workspace.xml
+++ b/res/xml-sw600dp/default_workspace.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 The Android Open Source Project
+<!-- Copyright (C) 2013 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.
@@ -18,6 +18,14 @@
     <!-- Far-left screen [0] -->
 
     <!-- Left screen [1] -->
+    <appwidget
+        launcher:packageName="com.google.android.music"
+        launcher:className="com.android.music.MediaAppWidgetProvider"
+        launcher:screen="1"
+        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"
@@ -26,36 +34,103 @@
         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="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.gallery3d"
-        launcher:className="com.android.camera.CameraLauncher"
+        launcher:packageName="com.android.vending"
+        launcher:className="com.android.vending.AssetBrowserActivity"
         launcher:screen="2"
-        launcher:x="5"
-        launcher:y="1" />
+        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,8 +143,15 @@
         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="0"
+        launcher:x="2"
+        launcher:y="0" />
+    <favorite
+        launcher:packageName="com.android.email"
+        launcher:className="com.android.email.activity.Welcome"
         launcher:container="-101"
         launcher:screen="0"
         launcher:x="2"
@@ -80,8 +162,8 @@
         launcher:x="3"
         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="0"
         launcher:x="4"
@@ -91,6 +173,20 @@
         launcher:className="com.android.browser.BrowserActivity"
         launcher:container="-101"
         launcher:screen="0"
+        launcher:x="4"
+        launcher:y="0" />
+    <favorite
+        launcher:packageName="com.android.gallery3d"
+        launcher:className="com.android.camera.CameraLauncher"
+        launcher:container="-101"
+        launcher:screen="0"
+        launcher:x="5"
+        launcher:y="0" />
+    <favorite
+        launcher:packageName="com.android.gallery3d"
+        launcher:className="com.android.gallery3d.app.GalleryActivity"
+        launcher:container="-101"
+        launcher:screen="0"
         launcher:x="5"
         launcher:y="0" />
 </favorites>
diff --git a/res/xml-sw600dp/default_workspace_no_telephony.xml b/res/xml-sw600dp/default_workspace_no_telephony.xml
index be003eac6..e1e98014b 100644
--- a/res/xml-sw600dp/default_workspace_no_telephony.xml
+++ b/res/xml-sw600dp/default_workspace_no_telephony.xml
@@ -18,14 +18,40 @@
     <!-- Far-left screen [0] -->
 
     <!-- Left screen [1] -->
+    <appwidget
+        launcher:packageName="com.google.android.music"
+        launcher:className="com.android.music.MediaAppWidgetProvider"
+        launcher:screen="1"
+        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="0"
+        launcher:x="1"
         launcher:y="0"
-        launcher:spanX="6"
+        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
@@ -36,40 +62,96 @@
         launcher:y="0"
         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.gallery3d"
-        launcher:className="com.android.camera.CameraLauncher"
+        launcher:packageName="com.android.vending"
+        launcher:className="com.android.vending.AssetBrowserActivity"
         launcher:screen="2"
-        launcher:x="5"
-        launcher:y="1" />
+        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="2"
+        launcher:x="1"
         launcher:y="5" />
     <favorite
         launcher:packageName="com.android.settings"
         launcher:className="com.android.settings.Settings"
         launcher:screen="3"
-        launcher:x="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: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:x="2"
+        launcher:y="0" />
+    <favorite
+        launcher:packageName="com.android.email"
+        launcher:className="com.android.email.activity.Welcome"
         launcher:container="-101"
         launcher:screen="0"
         launcher:x="2"
@@ -80,8 +162,8 @@
         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:x="4"
@@ -91,6 +173,20 @@
         launcher:className="com.android.browser.BrowserActivity"
         launcher:container="-101"
         launcher:screen="0"
+        launcher:x="4"
+        launcher:y="0" />
+    <favorite
+        launcher:packageName="com.android.gallery3d"
+        launcher:className="com.android.camera.CameraLauncher"
+        launcher:container="-101"
+        launcher:screen="0"
+        launcher:x="5"
+        launcher:y="0" />
+    <favorite
+        launcher:packageName="com.android.gallery3d"
+        launcher:className="com.android.gallery3d.app.GalleryActivity"
+        launcher:container="-101"
+        launcher:screen="0"
         launcher:x="5"
         launcher:y="0" />
 </favorites>
diff --git a/res/xml-sw720dp/default_workspace.xml b/res/xml-sw720dp/default_workspace.xml
index a4d30af5e..d57ac6d1d 100644
--- a/res/xml-sw720dp/default_workspace.xml
+++ b/res/xml-sw720dp/default_workspace.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 The Android Open Source Project
+<!-- Copyright (C) 2013 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.
@@ -18,6 +18,14 @@
     <!-- Far-left screen [0] -->
 
     <!-- Left screen [1] -->
+    <appwidget
+        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.AppWidgetLarge"
@@ -26,50 +34,124 @@
         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="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.gallery3d"
-        launcher:className="com.android.camera.CameraLauncher"
+        launcher:packageName="com.android.vending"
+        launcher:className="com.android.vending.AssetBrowserActivity"
         launcher:screen="2"
         launcher:x="5"
-        launcher:y="1" />
+        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.dialer.DialtactsActivity"
+        launcher:className="com.android.contacts.dialer.DialtactsActivity"
         launcher:container="-101"
         launcher:screen="0"
         launcher:x="2"
         launcher:y="0" />
     <favorite
-        launcher:packageName="com.android.contacts"
-        launcher:className="com.android.contacts.activities.PeopleActivity"
+        launcher:packageName="com.google.android.gm"
+        launcher:className="com.google.android.gm.ConversationListActivityGmail"
+        launcher:container="-101"
+        launcher:screen="0"
+        launcher:x="3"
+        launcher:y="0" />
+    <favorite
+        launcher:packageName="com.android.mms"
+        launcher:className="com.android.mms.ui.ConversationList"
         launcher:container="-101"
         launcher:screen="0"
         launcher:x="3"
@@ -80,8 +162,8 @@
         launcher:x="4"
         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="0"
         launcher:x="5"
@@ -91,6 +173,13 @@
         launcher:className="com.android.browser.BrowserActivity"
         launcher:container="-101"
         launcher:screen="0"
+        launcher:x="5"
+        launcher:y="0" />
+    <favorite
+        launcher:packageName="com.android.gallery3d"
+        launcher:className="com.android.camera.CameraLauncher"
+        launcher:container="-101"
+        launcher:screen="0"
         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 1d8a80097..edf2e85d7 100644
--- a/res/xml-sw720dp/default_workspace_no_telephony.xml
+++ b/res/xml-sw720dp/default_workspace_no_telephony.xml
@@ -18,6 +18,14 @@
     <!-- Far-left screen [0] -->
 
     <!-- Left screen [1] -->
+    <appwidget
+        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.AppWidgetLarge"
@@ -26,50 +34,124 @@
         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="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.gallery3d"
-        launcher:className="com.android.camera.CameraLauncher"
+        launcher:packageName="com.android.vending"
+        launcher:className="com.android.vending.AssetBrowserActivity"
         launcher:screen="2"
         launcher:x="5"
-        launcher:y="1" />
+        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: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:x="3"
+        launcher:y="0" />
+    <favorite
+        launcher:packageName="com.android.email"
+        launcher:className="com.android.email.activity.Welcome"
         launcher:container="-101"
         launcher:screen="0"
         launcher:x="3"
@@ -80,8 +162,8 @@
         launcher:x="4"
         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="5"
@@ -91,6 +173,13 @@
         launcher:className="com.android.browser.BrowserActivity"
         launcher:container="-101"
         launcher:screen="0"
+        launcher:x="5"
+        launcher:y="0" />
+    <favorite
+        launcher:packageName="com.android.gallery3d"
+        launcher:className="com.android.camera.CameraLauncher"
+        launcher:container="-101"
+        launcher:screen="0"
         launcher:x="6"
         launcher:y="0" />
 </favorites>
diff --git a/res/xml/default_workspace.xml b/res/xml/default_workspace.xml
index fc102f3df..210313ef7 100644
--- a/res/xml/default_workspace.xml
+++ b/res/xml/default_workspace.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
+<!-- Copyright (C) 2013 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.
@@ -18,14 +18,40 @@
     <!-- Far-left screen [0] -->
 
     <!-- Left screen [1] -->
+    <appwidget
+        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.AppWidgetLarge"
+        launcher:className="com.andrew.apollo.appwidgets.AppWidgetSmall"
         launcher:screen="1"
         launcher:x="0"
         launcher:y="0"
         launcher:spanX="4"
-        launcher:spanY="2" />
+        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
@@ -36,14 +62,59 @@
         launcher:y="0"
         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.gallery3d"
-        launcher:className="com.android.camera.CameraLauncher"
+        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,8 +139,8 @@
         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="0"
         launcher:x="1"
@@ -80,8 +151,8 @@
         launcher:x="2"
         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="0"
         launcher:x="3"
@@ -91,6 +162,13 @@
         launcher:className="com.android.browser.BrowserActivity"
         launcher:container="-101"
         launcher:screen="0"
+        launcher:x="3"
+        launcher:y="0" />
+    <favorite
+        launcher:packageName="com.android.gallery3d"
+        launcher:className="com.android.camera.CameraLauncher"
+        launcher:container="-101"
+        launcher:screen="0"
         launcher:x="4"
         launcher:y="0" />
 </favorites>
diff --git a/res/xml/default_workspace_no_telephony.xml b/res/xml/default_workspace_no_telephony.xml
index 1d4ef60e1..c9a6e7b2a 100644
--- a/res/xml/default_workspace_no_telephony.xml
+++ b/res/xml/default_workspace_no_telephony.xml
@@ -18,14 +18,40 @@
     <!-- Far-left screen [0] -->
 
     <!-- Left screen [1] -->
+    <appwidget
+        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.AppWidgetLarge"
+        launcher:className="com.andrew.apollo.appwidgets.AppWidgetSmall"
         launcher:screen="1"
         launcher:x="0"
         launcher:y="0"
         launcher:spanX="4"
-        launcher:spanY="2" />
+        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
@@ -36,14 +62,59 @@
         launcher:y="0"
         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.gallery3d"
-        launcher:className="com.android.camera.CameraLauncher"
+        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,15 +132,22 @@
 
     <!-- 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:x="1"
+        launcher:y="0" />
+    <favorite
+        launcher:packageName="com.android.email"
+        launcher:className="com.android.email.activity.Welcome"
         launcher:container="-101"
         launcher:screen="0"
         launcher:x="1"
@@ -80,8 +158,8 @@
         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:x="3"
@@ -91,6 +169,13 @@
         launcher:className="com.android.browser.BrowserActivity"
         launcher:container="-101"
         launcher:screen="0"
+        launcher:x="3"
+        launcher:y="0" />
+    <favorite
+        launcher:packageName="com.android.gallery3d"
+        launcher:className="com.android.camera.CameraLauncher"
+        launcher:container="-101"
+        launcher:screen="0"
         launcher:x="4"
         launcher:y="0" />
 </favorites>
-- 
cgit v1.2.3