Update default launcher layout.

Change-Id: Ifcc9788c2802c30187d4fe036b832e0ac45a5e92
diff --git a/BullheadLayout/res/xml/partner_default_layout.xml b/BullheadLayout/res/xml/partner_default_layout.xml
index 33b17fa..0842c87 100644
--- a/BullheadLayout/res/xml/partner_default_layout.xml
+++ b/BullheadLayout/res/xml/partner_default_layout.xml
@@ -13,188 +13,34 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-
 <!-- Google-specific version of Launcher3/res/xml/default_workspace.xml -->
 <favorites>
-
-    <!-- Hotseat (We use the screen as the position of the item in the hotseat) -->
-    <!-- Dialer Messaging [All Apps] Browser Camera -->
-
-    <favorite
-        container="-101"
-        screen="0"
-        x="0"
-        y="0"
-        packageName="com.google.android.dialer"
-        className="com.google.android.dialer.extensions.GoogleDialtactsActivity"
-    />
-
-    <favorite
-        container="-101"
-        screen="1"
-        x="1"
-        y="0"
-        packageName="com.google.android.apps.messaging"
-        className="com.google.android.apps.messaging.ui.ConversationListActivity"
-    />
-
-    <favorite
-        container="-101"
-        screen="3"
-        x="2"
-        y="0"
-        packageName="com.android.chrome"
-        className="com.google.android.apps.chrome.Main"
-    />
-
-    <favorite
-        container="-101"
-        screen="4"
-        x="3"
-        y="0"
-        packageName="com.google.android.GoogleCamera"
-        className="com.android.camera.CameraActivity"
-    />
-
-    <!-- In Launcher3, workspaces extend infinitely to the right, incrementing from zero -->
-
-	<!-- Google folder -->
-	<!-- Google, Maps, Gmail, G+, Calendar, Photos, YouTube, News & Weather, Hangouts -->
-
-	<folder
-			title="@string/google_folder_title"
-			screen="0"
-			x="0"
-			y="4">
-
-			<favorite
-	                packageName="com.google.android.googlequicksearchbox"
-	                className="com.google.android.googlequicksearchbox.SearchActivity"
-	                />
-
-			<favorite
-		            packageName="com.google.android.apps.maps"
-					className="com.google.android.maps.MapsActivity"
-			        />
-
-			<favorite
-	                packageName="com.google.android.gm"
-	                className="com.google.android.gm.ConversationListActivityGmail"
-	                />
-
-			<favorite
-				    packageName="com.google.android.apps.plus"
-					className="com.google.android.apps.plus.phone.HomeActivity"
-					/>
-
-			<favorite
-	                packageName="com.google.android.calendar"
-	                className="com.android.calendar.AllInOneActivity"
-	                />
-
-
-			<favorite
-		            packageName="com.google.android.apps.photos"
-				    className="com.google.android.apps.photos.home.HomeActivity"
-					/>
-
-			<favorite
-		            packageName="com.google.android.youtube"
-					className="com.google.android.youtube.app.honeycomb.Shell$HomeActivity"
-			        />
-
-			<favorite
-		            packageName="com.google.android.apps.genie.geniewidget"
-					className="com.google.android.apps.genie.geniewidget.activities.NewsActivity"
-			        />
-
-			<favorite
-		            packageName="com.google.android.talk"
-					className="com.google.android.talk.SigningInActivity"
-			        />
-
-	</folder>
-
-	<!-- Create folder -->
-	<!-- Docs, Sheets, Slides, Drive, Keep -->
-
-	<folder
-			title="@string/create_folder_title"
-			screen="0"
-			x="1"
-			y="4">
-
-			<favorite
-	                packageName="com.google.android.apps.docs.editors.docs"
-	                className="com.google.android.apps.docs.app.NewMainProxyActivity"
-	                />
-
-			<favorite
-					packageName="com.google.android.apps.docs.editors.sheets"
-			        className="com.google.android.apps.docs.app.NewMainProxyActivity"
-			        />
-
-			<favorite
-					packageName="com.google.android.apps.docs.editors.slides"
-			        className="com.google.android.apps.docs.app.NewMainProxyActivity"
-			        />
-
-			<favorite
-	                packageName="com.google.android.apps.docs"
-	                className="com.google.android.apps.docs.app.NewMainProxyActivity"
-	                />
-
-			<favorite
-		            packageName="com.google.android.keep"
-					className="com.google.android.keep.activities.BrowseActivity"
-			        />
-
-	</folder>
-
-	<!-- Play folder -->
-	<!-- Movies, Music, Games, Books, Newsstand -->
-
-	<folder
-			title="@string/play_folder_title"
-			screen="0"
-			x="3"
-			y="4">
-
-			<favorite
-		            packageName="com.google.android.videos"
-					className="com.google.android.youtube.videos.EntryPoint"
-			        />
-
-			<favorite
-	                packageName="com.google.android.music"
-	                className="com.android.music.activitymanagement.TopLevelActivity"
-	                />
-
-			<favorite
-	                packageName="com.google.android.play.games"
-	                className="com.google.android.gms.games.ui.destination.main.MainActivity"
-	                />
-
-			<favorite
-		            packageName="com.google.android.apps.books"
-					className="com.google.android.apps.books.app.BooksActivity"
-			        />
-
-			<favorite
-	                packageName="com.google.android.apps.magazines"
-	                className="com.google.apps.dots.android.app.activity.CurrentsStartActivity"
-	                />
-
-	</folder>
-
-	<favorite
-        screen="0"
-        x="4"
-        y="4"
-        packageName="com.android.vending"
-        className="com.android.vending.AssetBrowserActivity"
-    />
-
-    <!-- Any other installed apps will appear in All Apps -->
-
+  <!-- Hotseat (We use the screen as the position of the item in the hotseat) -->
+  <!-- Dialer Messaging [All Apps] Browser Camera -->
+  <favorite container="-101" screen="0" x="0" y="0" packageName="com.google.android.dialer" className="com.google.android.dialer.extensions.GoogleDialtactsActivity"/>
+  <favorite container="-101" screen="1" x="1" y="0" packageName="com.google.android.apps.messaging" className="com.google.android.apps.messaging.ui.ConversationListActivity"/>
+  <favorite container="-101" screen="3" x="2" y="0" packageName="com.android.chrome" className="com.google.android.apps.chrome.Main"/>
+  <favorite container="-101" screen="4" x="3" y="0" packageName="com.google.android.GoogleCamera" className="com.android.camera.CameraActivity"/>
+  <!-- In Launcher3, workspaces extend infinitely to the right, incrementing from zero -->
+  <!-- Google folder -->
+  <!-- Google, Maps, Gmail, Calendar, Photos, YouTube, Hangouts -->
+  <folder title="@string/google_folder_title" screen="0" x="0" y="4">
+    <favorite packageName="com.google.android.googlequicksearchbox" className="com.google.android.googlequicksearchbox.SearchActivity"/>
+    <favorite packageName="com.google.android.apps.maps" className="com.google.android.maps.MapsActivity"/>
+    <favorite packageName="com.google.android.gm" className="com.google.android.gm.ConversationListActivityGmail"/>
+    <favorite packageName="com.google.android.calendar" className="com.android.calendar.AllInOneActivity"/>
+    <favorite packageName="com.google.android.apps.photos" className="com.google.android.apps.photos.home.HomeActivity"/>
+    <favorite packageName="com.google.android.youtube" className="com.google.android.youtube.app.honeycomb.Shell$HomeActivity"/>
+    <favorite packageName="com.google.android.talk" className="com.google.android.talk.SigningInActivity"/>
+  </folder>
+  <!-- Play folder -->
+  <!-- Movies, Music, Games -->
+  <folder title="@string/play_folder_title" screen="0" x="3" y="4">
+    <favorite packageName="com.google.android.videos" className="com.google.android.youtube.videos.EntryPoint"/>
+    <favorite packageName="com.google.android.music" className="com.android.music.activitymanagement.TopLevelActivity"/>
+    <favorite packageName="com.google.android.play.games" className="com.google.android.gms.games.ui.destination.main.MainActivity"/>
+  </folder>
+  <favorite screen="0" x="4" y="4" packageName="com.android.vending" className="com.android.vending.AssetBrowserActivity"/>
+  <!-- Any other installed apps will appear in All Apps -->
 </favorites>
+