summaryrefslogtreecommitdiffstats
path: root/res/xml
diff options
context:
space:
mode:
authorMike Cleron <mcleron@google.com>2009-11-08 14:56:25 -0800
committerMike Cleron <mcleron@google.com>2009-11-08 15:39:29 -0800
commitb64b67a012fd22c0e705a89709fae0e6c9d15522 (patch)
treeb72152b7500b93c59eeb6df76a6eb2431939cfa3 /res/xml
parent3c675fc62a6196282bc452b1a8edabce84c98201 (diff)
downloadandroid_packages_apps_Trebuchet-b64b67a012fd22c0e705a89709fae0e6c9d15522.tar.gz
android_packages_apps_Trebuchet-b64b67a012fd22c0e705a89709fae0e6c9d15522.tar.bz2
android_packages_apps_Trebuchet-b64b67a012fd22c0e705a89709fae0e6c9d15522.zip
Fix http://b/issue?id=2203681
There is a race between the view system dispatching focus and mRollo being intialized. Now if AllApps is supposed to gain focus before mRollo is ready we remember that state and gain focus later.
Diffstat (limited to 'res/xml')
-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"