From 4cb3724a2c1e5f278e1531d643accc40fcd8e219 Mon Sep 17 00:00:00 2001
From: Michael Jurka <mikejurka@google.com>
Date: Mon, 9 Aug 2010 21:05:32 -0700
Subject: 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 | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

(limited to 'res/layout-xlarge')

diff --git a/res/layout-xlarge/launcher.xml b/res/layout-xlarge/launcher.xml
index 395b04871..6eb9318b4 100644
--- a/res/layout-xlarge/launcher.xml
+++ b/res/layout-xlarge/launcher.xml
@@ -69,27 +69,26 @@
             android:onClick="onClickConfigureButton"
             android:focusable="true"
             android:clickable="true" />
-        <ImageView
-            android:id="@+id/all_apps_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_toRightOf="@id/configure_button"
-            android:src="@drawable/all_apps_button"
-
-            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" />
+        <ImageView
+            android:id="@+id/all_apps_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_toRightOf="@id/configure_button"
+            android:src="@drawable/all_apps_button"
+
+            android:onClick="onClickAllAppsButton"
+            android:focusable="true"
+            android:clickable="true" />
     </RelativeLayout>
 
     <TabHost
-- 
cgit v1.2.3