commit 4cb3724a2c1e5f278e1531d643accc40fcd8e219
author Michael Jurka <mikejurka@google.com> Mon Aug 09 21:05:32 2010 -0700
committer Michael Jurka <mikejurka@google.com> Tue Aug 10 14:10:20 2010 -0700
tree 8b188e770e842eb14f72fd6d5b19d01b13e46bcb
parent 3ec8bdd576e23f6aa783d5377abecac6fda07374

workspace bug fixes

- fixed: pressing home sometimes left workspaces
in shrunken state
- fixed: position of delete zone (trash icon)
- fixed: workspace unshrink sometimes looked weird
when coming from all apps
- fixed: clicking power button and returning left
workspace in shrunken state

Change-Id: Ie974202926e6880ccda26ac9fe967fb587a9b7a3

res/layout-xlarge/launcher.xml

diff --git a/res/layout-xlarge/launcher.xml b/res/layout-xlarge/launcher.xml
index 395b048..6eb9318 100644
--- a/res/layout-xlarge/launcher.xml
+++ b/res/layout-xlarge/launcher.xml
@@ -69,6 +69,16 @@
             android:onClick="onClickConfigureButton"
             android:focusable="true"
             android:clickable="true" />
+        <com.android.launcher2.DeleteZone
+            android:id="@+id/delete_zone"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingTop="@dimen/delete_zone_padding"
+
+            android:scaleType="center"
+            android:src="@drawable/delete_zone_selector"
+            android:visibility="gone"
+            launcher:direction="horizontal" />
         <ImageView
             android:id="@+id/all_apps_button"
             android:layout_width="wrap_content"
@@ -79,17 +89,6 @@
             android:onClick="onClickAllAppsButton"
             android:focusable="true"
             android:clickable="true" />
-        <com.android.launcher2.DeleteZone
-            android:id="@+id/delete_zone"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingTop="@dimen/delete_zone_padding"
-            android:layout_toRightOf="@id/configure_button"
-
-            android:scaleType="center"
-            android:src="@drawable/delete_zone_selector"
-            android:visibility="gone"
-            launcher:direction="horizontal" />
     </RelativeLayout>
 
     <TabHost