commit 6b879f0a5885274a85333531e091283405d490cc
author Adam Lesinski <adamlesinski@google.com> Thu Nov 04 16:15:23 2010 -0700
committer Adam Lesinski <adamlesinski@google.com> Wed Nov 17 10:57:43 2010 -0800
tree eca43695425abca4fb465919aef7c4b295abc25d
parent 61033d3d86fcae1f654f3fbfc9979d131e265d76

Layout tweaks in Launcher

-Removed All apps and Configure toolbar buttons
from Customization Drawer, removed Configure
button from All apps and added Market icon
to All apps
-Changed spacing of CellLayouts when scrolling
-Modified gap spacing in workspace layout
-Made workspace invisible in All apps but touching
the place where the workspace was takes you back
to workspace

Change-Id: I6e2579bfebeb8f1f80fdae07da442f6d399abe33

res/layout-xlarge-land/launcher.xml

diff --git a/res/layout-xlarge-land/launcher.xml b/res/layout-xlarge-land/launcher.xml
index e5ba393..8e6f1fe 100644
--- a/res/layout-xlarge-land/launcher.xml
+++ b/res/layout-xlarge-land/launcher.xml
@@ -22,23 +22,17 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <include
-        layout="@layout/all_apps_tabbed"
-        android:id="@+id/all_apps_view"
-        android:layout_width="match_parent"
-        android:layout_height="600dp"
-        android:layout_gravity="top"/>
-
     <!-- The workspace contains 5 screens of cells -->
     <com.android.launcher2.Workspace
         android:id="@+id/workspace"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:paddingTop="?android:attr/actionBarSize"
+        android:paddingBottom="10dp"
         launcher:defaultScreen="2"
         launcher:cellCountX="8"
         launcher:cellCountY="7"
-        launcher:pageSpacing="32dp">
+        launcher:pageSpacing="50dp">
 
         <include android:id="@+id/cell1" layout="@layout/workspace_screen" />
         <include android:id="@+id/cell2" layout="@layout/workspace_screen" />
@@ -47,6 +41,13 @@
         <include android:id="@+id/cell5" layout="@layout/workspace_screen" />
     </com.android.launcher2.Workspace>
 
+    <include
+        layout="@layout/all_apps_tabbed"
+        android:id="@+id/all_apps_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="top" />
+
     <RelativeLayout
         android:id="@+id/all_apps_button_cluster"
         android:layout_width="fill_parent"
@@ -92,25 +93,12 @@
             android:focusable="true"
             android:clickable="true" />
 
-        <!-- The button to bring up the installed app market.
-             The icon for this button will be dynamically set. -->
-        <ImageView
-            android:id="@+id/market_button"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_alignLeft="@id/all_apps_button"
-
-            android:onClick="onClickAppMarketButton"
-            android:focusable="false"
-            android:clickable="false"
-            android:visibility="gone"/>
-
         <com.android.launcher2.DeleteZone
             android:id="@+id/delete_zone"
             android:src="@drawable/delete_zone_selector"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:layout_alignLeft="@id/all_apps_button"
+            android:layout_alignRight="@id/all_apps_button"
 
             android:visibility="gone"
             launcher:direction="horizontal" />