From b64b67a012fd22c0e705a89709fae0e6c9d15522 Mon Sep 17 00:00:00 2001
From: Mike Cleron <mcleron@google.com>
Date: Sun, 8 Nov 2009 14:56:25 -0800
Subject: 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.
---
 res/xml/default_workspace.xml | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

(limited to 'res/xml')

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"
-- 
cgit v1.2.3