summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorMike Cleron <mcleron@google.com>2009-11-09 16:26:39 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-11-09 16:26:39 -0800
commitb820019556b2b18f61dbd80b99a247f15b97147d (patch)
treead542faabd63a7068ebddf095b462c18905b35c1 /res
parent44094b57794518e1a7db18b497fd2ec223ba2be9 (diff)
parent18b36f0dbaaf7164a9a77dc5a5431d324e36c879 (diff)
downloadandroid_packages_apps_Trebuchet-b820019556b2b18f61dbd80b99a247f15b97147d.tar.gz
android_packages_apps_Trebuchet-b820019556b2b18f61dbd80b99a247f15b97147d.tar.bz2
android_packages_apps_Trebuchet-b820019556b2b18f61dbd80b99a247f15b97147d.zip
am 18b36f0d: am b6f23a6c: am bbe41b55: Merge change I4bd71b0f into eclair
Merge commit '18b36f0dbaaf7164a9a77dc5a5431d324e36c879' * commit '18b36f0dbaaf7164a9a77dc5a5431d324e36c879': Fix http://b/issue?id=2203681
Diffstat (limited to 'res')
-rw-r--r--res/xml/default_workspace.xml31
1 files changed, 14 insertions, 17 deletions
diff --git a/res/xml/default_workspace.xml b/res/xml/default_workspace.xml
index 2c8b8ff44..df7ca1ec3 100644
--- a/res/xml/default_workspace.xml
+++ b/res/xml/default_workspace.xml
@@ -16,31 +16,28 @@
<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"
launcher:y="0" />
- <favorite
+ <favorite
launcher:packageName="com.android.contacts"
launcher:className="com.android.contacts.DialtactsActivity"
launcher:screen="2"
@@ -83,23 +80,23 @@ com.android.camera
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" />
-
+
+ <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"