am c4bb5d41: Merge change I3c675fc6 into eclair

Merge commit 'c4bb5d411614765e0f93cbd257dc8172c39d913d' into eclair-mr2

* commit 'c4bb5d411614765e0f93cbd257dc8172c39d913d':
  New defaults for Passion

res/xml/default_workspace.xml

@@ -16,6 +16,25 @@
 
 <favorites xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher2">
 
+com.android.camera
+
+    <!--  Left screen [1] -->
+    
+    <favorite
+        launcher:packageName="com.android.camera"
+        launcher:className="com.android.camera.Camera"
+        launcher:screen="1"
+        launcher:x="1"
+        launcher:y="3" />
+ 
+     <favorite
+        launcher:packageName="com.android.camera"
+        launcher:className="com.android.camera.Camera"
+        launcher:screen="1"
+        launcher:x="2"
+        launcher:y="3" />
+               
+    <!--  Middle screen [2] -->
     <search
         launcher:screen="2"
         launcher:x="0"
@@ -63,4 +82,28 @@
         launcher:x="3"
         launcher:y="2" />
 
+    <!--  Right screen [3] -->
+    
+	<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.google.android.gm"
+        launcher:className="com.google.android.gm.ConversationListActivityGmail"
+        launcher:screen="3"
+        launcher:x="1"
+        launcher:y="3" />
+        		
+    <favorite
+        launcher:packageName="com.google.android.talk"
+        launcher:className="com.google.android.talk.SigningInActivity"
+        launcher:screen="3"
+        launcher:x="2"
+        launcher:y="3" />
 </favorites>