Add a market button and add toolbar button animations.

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

6 files changed, 47 insertions, 27 deletions

diff --git a/res/drawable-xlarge/info_button.png b/res/drawable-xlarge/info_button.png
index 5080f6ab4..e3b27f426 100644
--- a/res/drawable-xlarge/info_button.png
+++ b/res/drawable-xlarge/info_button.png
diff --git a/res/drawable-xlarge/trashcan.png b/res/drawable-xlarge/trashcan.png
new file mode 100644
index 000000000..284543c8f
--- /dev/null
+++ b/res/drawable-xlarge/trashcan.png
diff --git a/res/drawable-xlarge/trashcan_hover.png b/res/drawable-xlarge/trashcan_hover.png
new file mode 100644
index 000000000..38695cdd2
--- /dev/null
+++ b/res/drawable-xlarge/trashcan_hover.png
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" />
 
diff --git a/res/values-xlarge/config.xml b/res/values-xlarge/config.xml
index 1a9ecc675..9b1bc0d13 100644
--- a/res/values-xlarge/config.xml
+++ b/res/values-xlarge/config.xml
@@ -1,4 +1,6 @@
 <resources>
+    <!--  NOTE: Many of the all apps values here are also used for the customization drawer -->
+
     <!-- Duration in milliseconds of the all apps zoom-in animation. -->
     <!-- NB: This should be less than the workspaceShrinkTime as they happen together. -->
     <integer name="config_allAppsZoomInTime">350</integer>
@@ -10,12 +12,18 @@
     <!-- Scaling factor used in the all apps zooming animations -->
     <integer name="config_allAppsZoomScaleFactor">5</integer>
 
-    <!-- Duration in milliseconds of the camera pan animation b/w all apps & customize -->
-    <integer name="config_allAppsCameraPanTime">700</integer>
+    <!-- The extra distance off-screen that all apps appears from -->
+    <integer name="config_allAppsVerticalOffset">200</integer>
 
-    <!-- Duration in milliseconds of the workspace shrink animation -->
+    <!-- Duration in milliseconds of the animations between all apps, customize, & home.
+         NOTE: If these are changed, the toolbar animation times below should also be. -->
+    <integer name="config_allAppsCameraPanTime">700</integer>
     <integer name="config_workspaceShrinkTime">700</integer>
-
-    <!-- Duration in milliseconds of the workspace unshrink animation -->
     <integer name="config_workspaceUnshrinkTime">700</integer>
-</resources>
\ No newline at end of file
+
+    <!-- Duration in milliseconds toolbar fade in and fade out animations.
+         NOTE: Fade in and fade out time should together be less the transition
+         animations between all apps, customize, & the workspace. -->
+    <integer name="config_toolbarButtonFadeInTime">350</integer>
+    <integer name="config_toolbarButtonFadeOutTime">350</integer>
+</resources>
diff --git a/res/values-xlarge/dimens.xml b/res/values-xlarge/dimens.xml
index c9bd8366c..101039063 100644
--- a/res/values-xlarge/dimens.xml
+++ b/res/values-xlarge/dimens.xml
@@ -25,6 +25,7 @@
     <!-- vertical spacing between edge of screen and mini screen thumbnails -->
     <dimen name="smallScreenVerticalMargin">20dip</dimen>
 
-    <!-- padding above the delete zone -->
-    <dimen name="delete_zone_padding">6dip</dimen>
+    <dimen name="toolbar_padding">10dip</dimen>
+
+    <dimen name="toolbar_button_spacing">20dip</dimen>
 </resources>