Add a market button and add toolbar button animations.

Also clean up a lot of the animation code to be more centralized.

1 files changed, 30 insertions, 19 deletions

diff --git a/res/layout-xlarge/launcher.xml b/res/layout-xlarge/launcher.xml
index 4785b0c35..3add9117c 100644
--- a/res/layout-xlarge/launcher.xml
+++ b/res/layout-xlarge/launcher.xml
@@ -45,22 +45,23 @@
         <include android:id="@+id/cell5" layout="@layout/workspace_screen" />
     </com.android.launcher2.Workspace>
 
-    <ImageView
-        android:id="@+id/search_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="top|left"
-        android:src="@drawable/search_button"
-
-        android:onClick="onClickSearchButton"
-        android:focusable="true"
-        android:clickable="true"/>
-
     <RelativeLayout
         android:id="@+id/all_apps_button_cluster"
-        android:layout_width="wrap_content"
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="top|right">
+        android:layout_gravity="top"
+        android:padding="@dimen/toolbar_padding">
+
+        <ImageView
+            android:id="@+id/search_button"
+            android:src="@drawable/search_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="left"
+
+            android:onClick="onClickSearchButton"
+            android:focusable="true"
+            android:clickable="true"/>
 
         <ImageView
             android:id="@+id/all_apps_button"
@@ -68,17 +69,31 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
+            android:layout_marginLeft="@dimen/toolbar_button_spacing"
 
             android:onClick="onClickAllAppsButton"
             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="wrap_content"
+            android:layout_alignLeft="@id/all_apps_button"
+
+            android:focusable="false"
+            android:clickable="false"
+            android:visibility="gone"/>
+
         <ImageView
             android:id="@+id/configure_button"
             android:src="@drawable/configure_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_toLeftOf="@id/all_apps_button"
+            android:layout_marginLeft="@dimen/toolbar_button_spacing"
 
             android:onClick="onClickConfigureButton"
             android:focusable="true"
@@ -86,14 +101,11 @@
 
         <com.android.launcher2.DeleteZone
             android:id="@+id/delete_zone"
+            android:src="@drawable/delete_zone_selector"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignLeft="@id/all_apps_button"
-            android:layout_alignTop="@id/all_apps_button"
-            android:paddingTop="@dimen/delete_zone_padding"
 
-            android:scaleType="center"
-            android:src="@drawable/delete_zone_selector"
             android:visibility="gone"
             launcher:direction="horizontal" />
 
@@ -103,9 +115,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignLeft="@id/configure_button"
-            android:layout_centerVertical="true"
-            android:visibility="gone"
 
+            android:visibility="gone"
             android:focusable="true"
             android:clickable="true" />