From 769cdc7cbb11ae2eddb4569d41236bba47c5007e Mon Sep 17 00:00:00 2001
From: Matt Garnes <matt@cyngn.com>
Date: Tue, 30 Jun 2015 14:01:07 -0700
Subject: Update default workspace configuration.

- Add Chrome to the default folder.
- Move several gapps into a folder labeled "Play"
- Add a few apps to the second screen.
- Add an additional browser possibility to the hotseat that may be
  resolved.
- Update the Google Photos shortcut to use the correct Activity.

Change-Id: I97cd35fb75d4d303a188a69dd9805e076fbcca6c
---
 res/values/cm_strings.xml                     |   1 +
 res/xml/default_workspace_4x4.xml             | 107 +++++++++++++++----------
 res/xml/default_workspace_4x4_no_all_apps.xml | 105 +++++++++++++++----------
 res/xml/default_workspace_5x5.xml             | 108 ++++++++++++++++----------
 res/xml/default_workspace_5x5_no_all_apps.xml | 103 +++++++++++++++---------
 res/xml/default_workspace_5x6.xml             | 104 +++++++++++++++----------
 res/xml/default_workspace_5x6_no_all_apps.xml | 104 +++++++++++++++----------
 7 files changed, 389 insertions(+), 243 deletions(-)

diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 416925135..225e3358e 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -47,6 +47,7 @@
 
     <!-- Folder titles -->
     <string name="google_title" translatable="false">Google</string>
+    <string name="play_folder_title">Play</string>
 
     <!-- Scroll effect -->
     <string name="scroll_effect_text">Scroll effect</string>
diff --git a/res/xml/default_workspace_4x4.xml b/res/xml/default_workspace_4x4.xml
index dc821e592..a3e4e35ff 100644
--- a/res/xml/default_workspace_4x4.xml
+++ b/res/xml/default_workspace_4x4.xml
@@ -34,6 +34,9 @@
         <favorite
             launcher:className="com.google.android.googlequicksearchbox.SearchActivity"
             launcher:packageName="com.google.android.googlequicksearchbox" />
+        <favorite
+            launcher:packageName="com.android.chrome"
+            launcher:className="com.google.android.apps.chrome.Main" />
         <favorite
             launcher:className="com.google.android.gm.ConversationListActivityGmail"
             launcher:packageName="com.google.android.gm" />
@@ -46,30 +49,15 @@
         <favorite
             launcher:className="com.google.android.apps.docs.app.NewMainProxyActivity"
             launcher:packageName="com.google.android.apps.docs" />
-        <favorite
-            launcher:className="com.android.music.activitymanagement.TopLevelActivity"
-            launcher:packageName="com.google.android.music" />
-        <favorite
-            launcher:className="com.google.android.youtube.videos.EntryPoint"
-            launcher:packageName="com.google.android.videos" />
         <favorite
             launcher:className="com.google.android.talk.SigningInActivity"
             launcher:packageName="com.google.android.talk" />
         <favorite
-            launcher:className="com.google.android.apps.plus.phone.ConversationListActivity"
-            launcher:packageName="com.google.android.apps.plus" />
+            launcher:className="com.google.android.apps.photos.home.HomeActivity"
+            launcher:packageName="com.google.android.apps.photos" />
         <favorite
             launcher:className="com.android.calendar.AllInOneActivity"
-            launcher:packageName="com.google.android.calendar"/>
-        <favorite
-            launcher:className="com.google.android.apps.books.app.BooksActivity"
-            launcher:packageName="com.google.android.apps.books" />
-        <favorite
-            launcher:className="com.google.apps.dots.android.app.activity.CurrentsStartActivity"
-            launcher:packageName="com.google.android.apps.magazines" />
-        <favorite
-            launcher:className="com.google.android.gms.games.ui.destination.main.MainActivity"
-            launcher:packageName="com.google.android.play.games" />
+            launcher:packageName="com.google.android.calendar" />
         <favorite
             launcher:className="com.google.android.apps.plus.phone.HomeActivity"
             launcher:packageName="com.google.android.apps.plus" />
@@ -81,36 +69,42 @@
             launcher:packageName="com.google.android.apps.genie.geniewidget" />
     </folder>
 
-    <favorite
-        launcher:packageName="com.cyanogenmod.eleven"
-        launcher:className="com.cyanogenmod.eleven.ui.activities.HomeActivity"
-        launcher:screen="1"
-        launcher:x="1"
-        launcher:y="3" />
-
-    <!-- Gallery -->
-    <resolve
-        launcher:screen="1"
-        launcher:x="2"
-        launcher:y="3" >
+    <!-- Play Folder -->
+    <folder launcher:screen="1" launcher:x="1" launcher:y="3" launcher:title="@string/play_folder_title">
         <favorite
-            launcher:packageName="com.cyngn.gallerynext"
-            launcher:className="com.cyngn.gallerynext.app.GalleryActivity" />
+            launcher:className="com.android.music.activitymanagement.TopLevelActivity"
+            launcher:packageName="com.google.android.music" />
         <favorite
-            launcher:packageName="com.android.gallery3d"
-            launcher:className="com.android.gallery3d.app.GalleryActivity" />
-    </resolve>
+            launcher:className="com.google.android.youtube.videos.EntryPoint"
+            launcher:packageName="com.google.android.videos" />
+        <favorite
+            launcher:className="com.google.android.gms.games.ui.destination.main.MainActivity"
+            launcher:packageName="com.google.android.play.games" />
+        <favorite
+            launcher:className="com.google.android.apps.books.app.BooksActivity"
+            launcher:packageName="com.google.android.apps.books" />
+        <favorite
+            launcher:className="com.google.apps.dots.android.app.activity.CurrentsStartActivity"
+            launcher:packageName="com.google.android.apps.magazines" />
+    </folder>
+
+    <favorite
+            launcher:packageName="com.cyngn.themestore"
+            launcher:className="com.cyngn.themestore.ui.StoreActivity"
+            launcher:screen="1"
+            launcher:x="2"
+            launcher:y="3" />
 
     <resolve
         launcher:screen="1"
         launcher:x="3"
         launcher:y="3" >
-        <favorite
-            launcher:packageName="org.cyanogenmod.theme.chooser"
-            launcher:className="org.cyanogenmod.theme.chooser.ChooserActivity" />
         <favorite
             launcher:packageName="com.android.vending"
             launcher:className="com.android.vending.AssetBrowserActivity" />
+        <favorite
+            launcher:packageName="org.cyanogenmod.theme.chooser"
+            launcher:className="org.cyanogenmod.theme.chooser.ChooserActivity" />
     </resolve>
 
     <!-- Screen [2] -->
@@ -124,6 +118,32 @@
         launcher:spanX="4"
         launcher:spanY="2" />
 
+    <favorite
+        launcher:packageName="com.android.email"
+        launcher:className="com.android.email.activity.Welcome"
+        launcher:screen="2"
+        launcher:x="0"
+        launcher:y="3" />
+
+    <resolve
+        launcher:screen="2"
+        launcher:x="1"
+        launcher:y="3" >
+        <favorite
+            launcher:packageName="com.cyngn.gallerynext"
+            launcher:className="com.cyngn.gallerynext.app.GalleryActivity" />
+        <favorite
+            launcher:packageName="com.android.gallery3d"
+            launcher:className="com.android.gallery3d.app.GalleryActivity" />
+    </resolve>
+
+    <favorite
+        launcher:packageName="com.cyanogenmod.eleven"
+        launcher:className="com.cyanogenmod.eleven.ui.activities.HomeActivity"
+        launcher:screen="2"
+        launcher:x="2"
+        launcher:y="3" />
+
     <favorite
         launcher:packageName="com.android.settings"
         launcher:className="com.android.settings.Settings"
@@ -166,14 +186,17 @@
     <resolve
         launcher:container="-101"
         launcher:screen="3"
-        launcher:x="3"
+        launcher:x="2"
         launcher:y="0" >
-        <favorite
-            launcher:packageName="com.android.chrome"
-            launcher:className="com.google.android.apps.chrome.Main" />
         <favorite
             launcher:packageName="com.android.browser"
             launcher:className="com.android.browser.BrowserActivity" />
+        <favorite
+            launcher:packageName="com.android.swe.browser"
+            launcher:className="com.android.browser.BrowserActivity" />
+        <favorite
+            launcher:packageName="com.android.chrome"
+            launcher:className="com.google.android.apps.chrome.Main" />
     </resolve>
 
     <resolve
diff --git a/res/xml/default_workspace_4x4_no_all_apps.xml b/res/xml/default_workspace_4x4_no_all_apps.xml
index 4e21d0304..c2a454e4a 100644
--- a/res/xml/default_workspace_4x4_no_all_apps.xml
+++ b/res/xml/default_workspace_4x4_no_all_apps.xml
@@ -34,6 +34,9 @@
         <favorite
             launcher:className="com.google.android.googlequicksearchbox.SearchActivity"
             launcher:packageName="com.google.android.googlequicksearchbox" />
+        <favorite
+            launcher:packageName="com.android.chrome"
+            launcher:className="com.google.android.apps.chrome.Main" />
         <favorite
             launcher:className="com.google.android.gm.ConversationListActivityGmail"
             launcher:packageName="com.google.android.gm" />
@@ -46,30 +49,15 @@
         <favorite
             launcher:className="com.google.android.apps.docs.app.NewMainProxyActivity"
             launcher:packageName="com.google.android.apps.docs" />
-        <favorite
-            launcher:className="com.android.music.activitymanagement.TopLevelActivity"
-            launcher:packageName="com.google.android.music" />
-        <favorite
-            launcher:className="com.google.android.youtube.videos.EntryPoint"
-            launcher:packageName="com.google.android.videos" />
         <favorite
             launcher:className="com.google.android.talk.SigningInActivity"
             launcher:packageName="com.google.android.talk" />
         <favorite
-            launcher:className="com.google.android.apps.plus.phone.ConversationListActivity"
-            launcher:packageName="com.google.android.apps.plus" />
+            launcher:className="com.google.android.apps.photos.home.HomeActivity"
+            launcher:packageName="com.google.android.apps.photos" />
         <favorite
             launcher:className="com.android.calendar.AllInOneActivity"
-            launcher:packageName="com.google.android.calendar"/>
-        <favorite
-            launcher:className="com.google.android.apps.books.app.BooksActivity"
-            launcher:packageName="com.google.android.apps.books" />
-        <favorite
-            launcher:className="com.google.apps.dots.android.app.activity.CurrentsStartActivity"
-            launcher:packageName="com.google.android.apps.magazines" />
-        <favorite
-            launcher:className="com.google.android.gms.games.ui.destination.main.MainActivity"
-            launcher:packageName="com.google.android.play.games" />
+            launcher:packageName="com.google.android.calendar" />
         <favorite
             launcher:className="com.google.android.apps.plus.phone.HomeActivity"
             launcher:packageName="com.google.android.apps.plus" />
@@ -81,36 +69,42 @@
             launcher:packageName="com.google.android.apps.genie.geniewidget" />
     </folder>
 
-    <favorite
-        launcher:packageName="com.cyanogenmod.eleven"
-        launcher:className="com.cyanogenmod.eleven.ui.activities.HomeActivity"
-        launcher:screen="1"
-        launcher:x="1"
-        launcher:y="3" />
-
-    <!-- Gallery -->
-    <resolve
-        launcher:screen="1"
-        launcher:x="2"
-        launcher:y="3" >
+    <!-- Play Folder -->
+    <folder launcher:screen="1" launcher:x="1" launcher:y="3" launcher:title="@string/play_folder_title">
         <favorite
-            launcher:packageName="com.cyngn.gallerynext"
-            launcher:className="com.cyngn.gallerynext.app.GalleryActivity" />
+            launcher:className="com.android.music.activitymanagement.TopLevelActivity"
+            launcher:packageName="com.google.android.music" />
         <favorite
-            launcher:packageName="com.android.gallery3d"
-            launcher:className="com.android.gallery3d.app.GalleryActivity" />
-    </resolve>
+            launcher:className="com.google.android.youtube.videos.EntryPoint"
+            launcher:packageName="com.google.android.videos" />
+        <favorite
+            launcher:className="com.google.android.gms.games.ui.destination.main.MainActivity"
+            launcher:packageName="com.google.android.play.games" />
+        <favorite
+            launcher:className="com.google.android.apps.books.app.BooksActivity"
+            launcher:packageName="com.google.android.apps.books" />
+        <favorite
+            launcher:className="com.google.apps.dots.android.app.activity.CurrentsStartActivity"
+            launcher:packageName="com.google.android.apps.magazines" />
+    </folder>
+
+    <favorite
+            launcher:packageName="com.cyngn.themestore"
+            launcher:className="com.cyngn.themestore.ui.StoreActivity"
+            launcher:screen="1"
+            launcher:x="2"
+            launcher:y="3" />
 
     <resolve
         launcher:screen="1"
         launcher:x="3"
         launcher:y="3" >
-        <favorite
-            launcher:packageName="org.cyanogenmod.theme.chooser"
-            launcher:className="org.cyanogenmod.theme.chooser.ChooserActivity" />
         <favorite
             launcher:packageName="com.android.vending"
             launcher:className="com.android.vending.AssetBrowserActivity" />
+        <favorite
+            launcher:packageName="org.cyanogenmod.theme.chooser"
+            launcher:className="org.cyanogenmod.theme.chooser.ChooserActivity" />
     </resolve>
 
     <!-- Screen [2] -->
@@ -124,6 +118,32 @@
         launcher:spanX="4"
         launcher:spanY="2" />
 
+    <favorite
+        launcher:packageName="com.android.email"
+        launcher:className="com.android.email.activity.Welcome"
+        launcher:screen="2"
+        launcher:x="0"
+        launcher:y="3" />
+
+    <resolve
+        launcher:screen="2"
+        launcher:x="1"
+        launcher:y="3" >
+        <favorite
+            launcher:packageName="com.cyngn.gallerynext"
+            launcher:className="com.cyngn.gallerynext.app.GalleryActivity" />
+        <favorite
+            launcher:packageName="com.android.gallery3d"
+            launcher:className="com.android.gallery3d.app.GalleryActivity" />
+    </resolve>
+
+    <favorite
+        launcher:packageName="com.cyanogenmod.eleven"
+        launcher:className="com.cyanogenmod.eleven.ui.activities.HomeActivity"
+        launcher:screen="2"
+        launcher:x="2"
+        launcher:y="3" />
+
     <favorite
         launcher:packageName="com.android.settings"
         launcher:className="com.android.settings.Settings"
@@ -168,12 +188,15 @@
         launcher:screen="3"
         launcher:x="2"
         launcher:y="0" >
-        <favorite
-            launcher:packageName="com.android.chrome"
-            launcher:className="com.google.android.apps.chrome.Main" />
         <favorite
             launcher:packageName="com.android.browser"
             launcher:className="com.android.browser.BrowserActivity" />
+        <favorite
+            launcher:packageName="com.android.swe.browser"
+            launcher:className="com.android.browser.BrowserActivity" />
+        <favorite
+            launcher:packageName="com.android.chrome"
+            launcher:className="com.google.android.apps.chrome.Main" />
     </resolve>
 
     <resolve
diff --git a/res/xml/default_workspace_5x5.xml b/res/xml/default_workspace_5x5.xml
index 4a6f5d689..2ad309ee5 100644
--- a/res/xml/default_workspace_5x5.xml
+++ b/res/xml/default_workspace_5x5.xml
@@ -34,6 +34,9 @@
         <favorite
             launcher:className="com.google.android.googlequicksearchbox.SearchActivity"
             launcher:packageName="com.google.android.googlequicksearchbox" />
+        <favorite
+            launcher:packageName="com.android.chrome"
+            launcher:className="com.google.android.apps.chrome.Main" />
         <favorite
             launcher:className="com.google.android.gm.ConversationListActivityGmail"
             launcher:packageName="com.google.android.gm" />
@@ -46,30 +49,15 @@
         <favorite
             launcher:className="com.google.android.apps.docs.app.NewMainProxyActivity"
             launcher:packageName="com.google.android.apps.docs" />
-        <favorite
-            launcher:className="com.android.music.activitymanagement.TopLevelActivity"
-            launcher:packageName="com.google.android.music" />
-        <favorite
-            launcher:className="com.google.android.youtube.videos.EntryPoint"
-            launcher:packageName="com.google.android.videos" />
         <favorite
             launcher:className="com.google.android.talk.SigningInActivity"
             launcher:packageName="com.google.android.talk" />
         <favorite
-            launcher:className="com.google.android.apps.plus.phone.ConversationListActivity"
-            launcher:packageName="com.google.android.apps.plus" />
+            launcher:className="com.google.android.apps.photos.home.HomeActivity"
+            launcher:packageName="com.google.android.apps.photos" />
         <favorite
             launcher:className="com.android.calendar.AllInOneActivity"
-            launcher:packageName="com.google.android.calendar"/>
-        <favorite
-            launcher:className="com.google.android.apps.books.app.BooksActivity"
-            launcher:packageName="com.google.android.apps.books" />
-        <favorite
-            launcher:className="com.google.apps.dots.android.app.activity.CurrentsStartActivity"
-            launcher:packageName="com.google.android.apps.magazines" />
-        <favorite
-            launcher:className="com.google.android.gms.games.ui.destination.main.MainActivity"
-            launcher:packageName="com.google.android.play.games" />
+            launcher:packageName="com.google.android.calendar" />
         <favorite
             launcher:className="com.google.android.apps.plus.phone.HomeActivity"
             launcher:packageName="com.google.android.apps.plus" />
@@ -81,35 +69,42 @@
             launcher:packageName="com.google.android.apps.genie.geniewidget" />
     </folder>
 
-    <favorite
-        launcher:packageName="com.cyanogenmod.eleven"
-        launcher:className="com.cyanogenmod.eleven.ui.activities.HomeActivity"
-        launcher:screen="1"
-        launcher:x="1"
-        launcher:y="4" />
-
-    <resolve
-        launcher:screen="1"
-        launcher:x="2"
-        launcher:y="4" >
+    <!-- Play Folder -->
+    <folder launcher:screen="1" launcher:x="1" launcher:y="4" launcher:title="@string/play_folder_title">
         <favorite
-            launcher:packageName="com.cyngn.gallerynext"
-            launcher:className="com.cyngn.gallerynext.app.GalleryActivity" />
+            launcher:className="com.android.music.activitymanagement.TopLevelActivity"
+            launcher:packageName="com.google.android.music" />
         <favorite
-            launcher:packageName="com.android.gallery3d"
-            launcher:className="com.android.gallery3d.app.GalleryActivity" />
-    </resolve>
+            launcher:className="com.google.android.youtube.videos.EntryPoint"
+            launcher:packageName="com.google.android.videos" />
+        <favorite
+            launcher:className="com.google.android.gms.games.ui.destination.main.MainActivity"
+            launcher:packageName="com.google.android.play.games" />
+        <favorite
+            launcher:className="com.google.android.apps.books.app.BooksActivity"
+            launcher:packageName="com.google.android.apps.books" />
+        <favorite
+            launcher:className="com.google.apps.dots.android.app.activity.CurrentsStartActivity"
+            launcher:packageName="com.google.android.apps.magazines" />
+    </folder>
+
+    <favorite
+            launcher:packageName="com.cyngn.themestore"
+            launcher:className="com.cyngn.themestore.ui.StoreActivity"
+            launcher:screen="1"
+            launcher:x="3"
+            launcher:y="4" />
 
     <resolve
         launcher:screen="1"
-        launcher:x="3"
+        launcher:x="4"
         launcher:y="4" >
-        <favorite
-            launcher:packageName="org.cyanogenmod.theme.chooser"
-            launcher:className="org.cyanogenmod.theme.chooser.ChooserActivity" />
         <favorite
             launcher:packageName="com.android.vending"
             launcher:className="com.android.vending.AssetBrowserActivity" />
+        <favorite
+            launcher:packageName="org.cyanogenmod.theme.chooser"
+            launcher:className="org.cyanogenmod.theme.chooser.ChooserActivity" />
     </resolve>
 
     <!-- Screen [2] -->
@@ -123,6 +118,32 @@
         launcher:spanX="5"
         launcher:spanY="2" />
 
+    <favorite
+        launcher:packageName="com.android.email"
+        launcher:className="com.android.email.activity.Welcome"
+        launcher:screen="2"
+        launcher:x="0"
+        launcher:y="4" />
+
+    <resolve
+        launcher:screen="2"
+        launcher:x="1"
+        launcher:y="4" >
+        <favorite
+            launcher:packageName="com.cyngn.gallerynext"
+            launcher:className="com.cyngn.gallerynext.app.GalleryActivity" />
+        <favorite
+            launcher:packageName="com.android.gallery3d"
+            launcher:className="com.android.gallery3d.app.GalleryActivity" />
+    </resolve>
+
+    <favorite
+        launcher:packageName="com.cyanogenmod.eleven"
+        launcher:className="com.cyanogenmod.eleven.ui.activities.HomeActivity"
+        launcher:screen="2"
+        launcher:x="0"
+        launcher:y="4" />
+
     <favorite
         launcher:packageName="com.android.settings"
         launcher:className="com.android.settings.Settings"
@@ -165,14 +186,17 @@
     <resolve
         launcher:container="-101"
         launcher:screen="3"
-        launcher:x="3"
+        launcher:x="2"
         launcher:y="0" >
-        <favorite
-            launcher:packageName="com.android.chrome"
-            launcher:className="com.google.android.apps.chrome.Main" />
         <favorite
             launcher:packageName="com.android.browser"
             launcher:className="com.android.browser.BrowserActivity" />
+        <favorite
+            launcher:packageName="com.android.swe.browser"
+            launcher:className="com.android.browser.BrowserActivity" />
+        <favorite
+            launcher:packageName="com.android.chrome"
+            launcher:className="com.google.android.apps.chrome.Main" />
     </resolve>
 
     <resolve
diff --git a/res/xml/default_workspace_5x5_no_all_apps.xml b/res/xml/default_workspace_5x5_no_all_apps.xml
index 5bf3bc69e..b4689d4e1 100644
--- a/res/xml/default_workspace_5x5_no_all_apps.xml
+++ b/res/xml/default_workspace_5x5_no_all_apps.xml
@@ -34,6 +34,9 @@
         <favorite
             launcher:className="com.google.android.googlequicksearchbox.SearchActivity"
             launcher:packageName="com.google.android.googlequicksearchbox" />
+        <favorite
+            launcher:packageName="com.android.chrome"
+            launcher:className="com.google.android.apps.chrome.Main" />
         <favorite
             launcher:className="com.google.android.gm.ConversationListActivityGmail"
             launcher:packageName="com.google.android.gm" />
@@ -46,30 +49,15 @@
         <favorite
             launcher:className="com.google.android.apps.docs.app.NewMainProxyActivity"
             launcher:packageName="com.google.android.apps.docs" />
-        <favorite
-            launcher:className="com.android.music.activitymanagement.TopLevelActivity"
-            launcher:packageName="com.google.android.music" />
-        <favorite
-            launcher:className="com.google.android.youtube.videos.EntryPoint"
-            launcher:packageName="com.google.android.videos" />
         <favorite
             launcher:className="com.google.android.talk.SigningInActivity"
             launcher:packageName="com.google.android.talk" />
         <favorite
-            launcher:className="com.google.android.apps.plus.phone.ConversationListActivity"
-            launcher:packageName="com.google.android.apps.plus" />
+            launcher:className="com.google.android.apps.photos.home.HomeActivity"
+            launcher:packageName="com.google.android.apps.photos" />
         <favorite
             launcher:className="com.android.calendar.AllInOneActivity"
-            launcher:packageName="com.google.android.calendar"/>
-        <favorite
-            launcher:className="com.google.android.apps.books.app.BooksActivity"
-            launcher:packageName="com.google.android.apps.books" />
-        <favorite
-            launcher:className="com.google.apps.dots.android.app.activity.CurrentsStartActivity"
-            launcher:packageName="com.google.android.apps.magazines" />
-        <favorite
-            launcher:className="com.google.android.gms.games.ui.destination.main.MainActivity"
-            launcher:packageName="com.google.android.play.games" />
+            launcher:packageName="com.google.android.calendar" />
         <favorite
             launcher:className="com.google.android.apps.plus.phone.HomeActivity"
             launcher:packageName="com.google.android.apps.plus" />
@@ -81,29 +69,39 @@
             launcher:packageName="com.google.android.apps.genie.geniewidget" />
     </folder>
 
-    <favorite
-        launcher:packageName="com.cyanogenmod.eleven"
-        launcher:className="com.cyanogenmod.eleven.ui.activities.HomeActivity"
-        launcher:screen="1"
-        launcher:x="1"
-        launcher:y="4" />
-
-    <resolve
-        launcher:screen="1"
-        launcher:x="2"
-        launcher:y="4" >
+    <!-- Play Folder -->
+    <folder launcher:screen="1" launcher:x="1" launcher:y="4" launcher:title="@string/play_folder_title">
         <favorite
-            launcher:packageName="com.cyngn.gallerynext"
-            launcher:className="com.cyngn.gallerynext.app.GalleryActivity" />
+            launcher:className="com.android.music.activitymanagement.TopLevelActivity"
+            launcher:packageName="com.google.android.music" />
         <favorite
-            launcher:packageName="com.android.gallery3d"
-            launcher:className="com.android.gallery3d.app.GalleryActivity" />
-    </resolve>
+            launcher:className="com.google.android.youtube.videos.EntryPoint"
+            launcher:packageName="com.google.android.videos" />
+        <favorite
+            launcher:className="com.google.android.gms.games.ui.destination.main.MainActivity"
+            launcher:packageName="com.google.android.play.games" />
+        <favorite
+            launcher:className="com.google.android.apps.books.app.BooksActivity"
+            launcher:packageName="com.google.android.apps.books" />
+        <favorite
+            launcher:className="com.google.apps.dots.android.app.activity.CurrentsStartActivity"
+            launcher:packageName="com.google.android.apps.magazines" />
+    </folder>
+
+    <favorite
+            launcher:packageName="com.cyngn.themestore"
+            launcher:className="com.cyngn.themestore.ui.StoreActivity"
+            launcher:screen="1"
+            launcher:x="3"
+            launcher:y="4" />
 
     <resolve
         launcher:screen="1"
-        launcher:x="3"
+        launcher:x="4"
         launcher:y="4" >
+        <favorite
+            launcher:packageName="com.android.vending"
+            launcher:className="com.android.vending.AssetBrowserActivity" />
         <favorite
             launcher:packageName="org.cyanogenmod.theme.chooser"
             launcher:className="org.cyanogenmod.theme.chooser.ChooserActivity" />
@@ -123,6 +121,32 @@
         launcher:spanX="5"
         launcher:spanY="2" />
 
+    <favorite
+        launcher:packageName="com.android.email"
+        launcher:className="com.android.email.activity.Welcome"
+        launcher:screen="2"
+        launcher:x="0"
+        launcher:y="4" />
+
+    <resolve
+        launcher:screen="2"
+        launcher:x="1"
+        launcher:y="4" >
+        <favorite
+            launcher:packageName="com.cyngn.gallerynext"
+            launcher:className="com.cyngn.gallerynext.app.GalleryActivity" />
+        <favorite
+            launcher:packageName="com.android.gallery3d"
+            launcher:className="com.android.gallery3d.app.GalleryActivity" />
+    </resolve>
+
+    <favorite
+        launcher:packageName="com.cyanogenmod.eleven"
+        launcher:className="com.cyanogenmod.eleven.ui.activities.HomeActivity"
+        launcher:screen="2"
+        launcher:x="0"
+        launcher:y="4" />
+
     <favorite
         launcher:packageName="com.android.settings"
         launcher:className="com.android.settings.Settings"
@@ -167,12 +191,15 @@
         launcher:screen="3"
         launcher:x="2"
         launcher:y="0" >
-        <favorite
-            launcher:packageName="com.android.chrome"
-            launcher:className="com.google.android.apps.chrome.Main" />
         <favorite
             launcher:packageName="com.android.browser"
             launcher:className="com.android.browser.BrowserActivity" />
+        <favorite
+            launcher:packageName="com.android.swe.browser"
+            launcher:className="com.android.browser.BrowserActivity" />
+        <favorite
+            launcher:packageName="com.android.chrome"
+            launcher:className="com.google.android.apps.chrome.Main" />
     </resolve>
 
     <resolve
diff --git a/res/xml/default_workspace_5x6.xml b/res/xml/default_workspace_5x6.xml
index a086d4a98..3a2ea73e3 100644
--- a/res/xml/default_workspace_5x6.xml
+++ b/res/xml/default_workspace_5x6.xml
@@ -34,6 +34,9 @@
         <favorite
             launcher:className="com.google.android.googlequicksearchbox.SearchActivity"
             launcher:packageName="com.google.android.googlequicksearchbox" />
+        <favorite
+            launcher:packageName="com.android.chrome"
+            launcher:className="com.google.android.apps.chrome.Main" />
         <favorite
             launcher:className="com.google.android.gm.ConversationListActivityGmail"
             launcher:packageName="com.google.android.gm" />
@@ -46,30 +49,15 @@
         <favorite
             launcher:className="com.google.android.apps.docs.app.NewMainProxyActivity"
             launcher:packageName="com.google.android.apps.docs" />
-        <favorite
-            launcher:className="com.android.music.activitymanagement.TopLevelActivity"
-            launcher:packageName="com.google.android.music" />
-        <favorite
-            launcher:className="com.google.android.youtube.videos.EntryPoint"
-            launcher:packageName="com.google.android.videos" />
         <favorite
             launcher:className="com.google.android.talk.SigningInActivity"
             launcher:packageName="com.google.android.talk" />
         <favorite
-            launcher:className="com.google.android.apps.plus.phone.ConversationListActivity"
-            launcher:packageName="com.google.android.apps.plus" />
+            launcher:className="com.google.android.apps.photos.home.HomeActivity"
+            launcher:packageName="com.google.android.apps.photos" />
         <favorite
             launcher:className="com.android.calendar.AllInOneActivity"
-            launcher:packageName="com.google.android.calendar"/>
-        <favorite
-            launcher:className="com.google.android.apps.books.app.BooksActivity"
-            launcher:packageName="com.google.android.apps.books" />
-        <favorite
-            launcher:className="com.google.apps.dots.android.app.activity.CurrentsStartActivity"
-            launcher:packageName="com.google.android.apps.magazines" />
-        <favorite
-            launcher:className="com.google.android.gms.games.ui.destination.main.MainActivity"
-            launcher:packageName="com.google.android.play.games" />
+            launcher:packageName="com.google.android.calendar" />
         <favorite
             launcher:className="com.google.android.apps.plus.phone.HomeActivity"
             launcher:packageName="com.google.android.apps.plus" />
@@ -81,35 +69,42 @@
             launcher:packageName="com.google.android.apps.genie.geniewidget" />
     </folder>
 
-    <favorite
-        launcher:packageName="com.cyanogenmod.eleven"
-        launcher:className="com.cyanogenmod.eleven.ui.activities.HomeActivity"
-        launcher:screen="1"
-        launcher:x="1"
-        launcher:y="4" />
-
-    <resolve
-        launcher:screen="1"
-        launcher:x="4"
-        launcher:y="4" >
+    <!-- Play Folder -->
+    <folder launcher:screen="1" launcher:x="1" launcher:y="4" launcher:title="@string/play_folder_title">
         <favorite
-            launcher:packageName="com.cyngn.gallerynext"
-            launcher:className="com.cyngn.gallerynext.app.GalleryActivity" />
+            launcher:className="com.android.music.activitymanagement.TopLevelActivity"
+            launcher:packageName="com.google.android.music" />
         <favorite
-            launcher:packageName="com.android.gallery3d"
-            launcher:className="com.android.gallery3d.app.GalleryActivity" />
-    </resolve>
+            launcher:className="com.google.android.youtube.videos.EntryPoint"
+            launcher:packageName="com.google.android.videos" />
+        <favorite
+            launcher:className="com.google.android.gms.games.ui.destination.main.MainActivity"
+            launcher:packageName="com.google.android.play.games" />
+        <favorite
+            launcher:className="com.google.android.apps.books.app.BooksActivity"
+            launcher:packageName="com.google.android.apps.books" />
+        <favorite
+            launcher:className="com.google.apps.dots.android.app.activity.CurrentsStartActivity"
+            launcher:packageName="com.google.android.apps.magazines" />
+    </folder>
+
+    <favorite
+            launcher:packageName="com.cyngn.themestore"
+            launcher:className="com.cyngn.themestore.ui.StoreActivity"
+            launcher:screen="1"
+            launcher:x="2"
+            launcher:y="3" />
 
     <resolve
         launcher:screen="1"
         launcher:x="5"
         launcher:y="4" >
-        <favorite
-            launcher:packageName="org.cyanogenmod.theme.chooser"
-            launcher:className="org.cyanogenmod.theme.chooser.ChooserActivity" />
         <favorite
             launcher:packageName="com.android.vending"
             launcher:className="com.android.vending.AssetBrowserActivity" />
+        <favorite
+            launcher:packageName="org.cyanogenmod.theme.chooser"
+            launcher:className="org.cyanogenmod.theme.chooser.ChooserActivity" />
     </resolve>
 
     <!-- Screen [2] -->
@@ -123,6 +118,32 @@
         launcher:spanX="6"
         launcher:spanY="2" />
 
+    <favorite
+        launcher:packageName="com.android.email"
+        launcher:className="com.android.email.activity.Welcome"
+        launcher:screen="2"
+        launcher:x="0"
+        launcher:y="4" />
+
+    <resolve
+        launcher:screen="2"
+        launcher:x="1"
+        launcher:y="4" >
+        <favorite
+            launcher:packageName="com.cyngn.gallerynext"
+            launcher:className="com.cyngn.gallerynext.app.GalleryActivity" />
+        <favorite
+            launcher:packageName="com.android.gallery3d"
+            launcher:className="com.android.gallery3d.app.GalleryActivity" />
+    </resolve>
+
+    <favorite
+        launcher:packageName="com.cyanogenmod.eleven"
+        launcher:className="com.cyanogenmod.eleven.ui.activities.HomeActivity"
+        launcher:screen="2"
+        launcher:x="2"
+        launcher:y="4" />
+
     <favorite
         launcher:packageName="com.android.settings"
         launcher:className="com.android.settings.Settings"
@@ -167,12 +188,15 @@
         launcher:screen="4"
         launcher:x="4"
         launcher:y="0" >
-        <favorite
-            launcher:packageName="com.android.chrome"
-            launcher:className="com.google.android.apps.chrome.Main" />
         <favorite
             launcher:packageName="com.android.browser"
             launcher:className="com.android.browser.BrowserActivity" />
+        <favorite
+            launcher:packageName="com.android.swe.browser"
+            launcher:className="com.android.browser.BrowserActivity" />
+        <favorite
+            launcher:packageName="com.android.chrome"
+            launcher:className="com.google.android.apps.chrome.Main" />
     </resolve>
 
     <resolve
diff --git a/res/xml/default_workspace_5x6_no_all_apps.xml b/res/xml/default_workspace_5x6_no_all_apps.xml
index ba4b8e247..4f9d09fb0 100644
--- a/res/xml/default_workspace_5x6_no_all_apps.xml
+++ b/res/xml/default_workspace_5x6_no_all_apps.xml
@@ -34,6 +34,9 @@
         <favorite
             launcher:className="com.google.android.googlequicksearchbox.SearchActivity"
             launcher:packageName="com.google.android.googlequicksearchbox" />
+        <favorite
+            launcher:packageName="com.android.chrome"
+            launcher:className="com.google.android.apps.chrome.Main" />
         <favorite
             launcher:className="com.google.android.gm.ConversationListActivityGmail"
             launcher:packageName="com.google.android.gm" />
@@ -46,30 +49,15 @@
         <favorite
             launcher:className="com.google.android.apps.docs.app.NewMainProxyActivity"
             launcher:packageName="com.google.android.apps.docs" />
-        <favorite
-            launcher:className="com.android.music.activitymanagement.TopLevelActivity"
-            launcher:packageName="com.google.android.music" />
-        <favorite
-            launcher:className="com.google.android.youtube.videos.EntryPoint"
-            launcher:packageName="com.google.android.videos" />
         <favorite
             launcher:className="com.google.android.talk.SigningInActivity"
             launcher:packageName="com.google.android.talk" />
         <favorite
-            launcher:className="com.google.android.apps.plus.phone.ConversationListActivity"
-            launcher:packageName="com.google.android.apps.plus" />
+            launcher:className="com.google.android.apps.photos.home.HomeActivity"
+            launcher:packageName="com.google.android.apps.photos" />
         <favorite
             launcher:className="com.android.calendar.AllInOneActivity"
-            launcher:packageName="com.google.android.calendar"/>
-        <favorite
-            launcher:className="com.google.android.apps.books.app.BooksActivity"
-            launcher:packageName="com.google.android.apps.books" />
-        <favorite
-            launcher:className="com.google.apps.dots.android.app.activity.CurrentsStartActivity"
-            launcher:packageName="com.google.android.apps.magazines" />
-        <favorite
-            launcher:className="com.google.android.gms.games.ui.destination.main.MainActivity"
-            launcher:packageName="com.google.android.play.games" />
+            launcher:packageName="com.google.android.calendar" />
         <favorite
             launcher:className="com.google.android.apps.plus.phone.HomeActivity"
             launcher:packageName="com.google.android.apps.plus" />
@@ -81,35 +69,42 @@
             launcher:packageName="com.google.android.apps.genie.geniewidget" />
     </folder>
 
-    <favorite
-        launcher:packageName="com.cyanogenmod.eleven"
-        launcher:className="com.cyanogenmod.eleven.ui.activities.HomeActivity"
-        launcher:screen="1"
-        launcher:x="1"
-        launcher:y="4" />
-
-    <resolve
-        launcher:screen="1"
-        launcher:x="4"
-        launcher:y="4" >
+    <!-- Play Folder -->
+    <folder launcher:screen="1" launcher:x="1" launcher:y="4" launcher:title="@string/play_folder_title">
         <favorite
-            launcher:packageName="com.cyngn.gallerynext"
-            launcher:className="com.cyngn.gallerynext.app.GalleryActivity" />
+            launcher:className="com.android.music.activitymanagement.TopLevelActivity"
+            launcher:packageName="com.google.android.music" />
         <favorite
-            launcher:packageName="com.android.gallery3d"
-            launcher:className="com.android.gallery3d.app.GalleryActivity" />
-    </resolve>
+            launcher:className="com.google.android.youtube.videos.EntryPoint"
+            launcher:packageName="com.google.android.videos" />
+        <favorite
+            launcher:className="com.google.android.gms.games.ui.destination.main.MainActivity"
+            launcher:packageName="com.google.android.play.games" />
+        <favorite
+            launcher:className="com.google.android.apps.books.app.BooksActivity"
+            launcher:packageName="com.google.android.apps.books" />
+        <favorite
+            launcher:className="com.google.apps.dots.android.app.activity.CurrentsStartActivity"
+            launcher:packageName="com.google.android.apps.magazines" />
+    </folder>
+
+    <favorite
+            launcher:packageName="com.cyngn.themestore"
+            launcher:className="com.cyngn.themestore.ui.StoreActivity"
+            launcher:screen="1"
+            launcher:x="2"
+            launcher:y="3" />
 
     <resolve
         launcher:screen="1"
         launcher:x="5"
         launcher:y="4" >
-        <favorite
-            launcher:packageName="org.cyanogenmod.theme.chooser"
-            launcher:className="org.cyanogenmod.theme.chooser.ChooserActivity" />
         <favorite
             launcher:packageName="com.android.vending"
             launcher:className="com.android.vending.AssetBrowserActivity" />
+        <favorite
+            launcher:packageName="org.cyanogenmod.theme.chooser"
+            launcher:className="org.cyanogenmod.theme.chooser.ChooserActivity" />
     </resolve>
 
     <!-- Screen [2] -->
@@ -123,6 +118,32 @@
         launcher:spanX="6"
         launcher:spanY="2" />
 
+    <favorite
+        launcher:packageName="com.android.email"
+        launcher:className="com.android.email.activity.Welcome"
+        launcher:screen="2"
+        launcher:x="0"
+        launcher:y="4" />
+
+    <resolve
+        launcher:screen="2"
+        launcher:x="1"
+        launcher:y="4" >
+        <favorite
+            launcher:packageName="com.cyngn.gallerynext"
+            launcher:className="com.cyngn.gallerynext.app.GalleryActivity" />
+        <favorite
+            launcher:packageName="com.android.gallery3d"
+            launcher:className="com.android.gallery3d.app.GalleryActivity" />
+    </resolve>
+
+    <favorite
+        launcher:packageName="com.cyanogenmod.eleven"
+        launcher:className="com.cyanogenmod.eleven.ui.activities.HomeActivity"
+        launcher:screen="2"
+        launcher:x="2"
+        launcher:y="4" />
+
     <favorite
         launcher:packageName="com.android.settings"
         launcher:className="com.android.settings.Settings"
@@ -167,12 +188,15 @@
         launcher:screen="4"
         launcher:x="5"
         launcher:y="0" >
+       <favorite
+            launcher:packageName="com.android.browser"
+            launcher:className="com.android.browser.BrowserActivity" />
+        <favorite
+            launcher:packageName="com.android.swe.browser"
+            launcher:className="com.android.browser.BrowserActivity" />
         <favorite
             launcher:packageName="com.android.chrome"
             launcher:className="com.google.android.apps.chrome.Main" />
-        <favorite
-            launcher:packageName="com.android.browser"
-            launcher:className="com.android.browser.BrowserActivity" />
     </resolve>
 
     <resolve
-- 
cgit v1.2.3