refreshed apps/configure button, added search button

- configure button now has a pressed state (as
  do the other two)
- also added a cast to getX() from float->int
  because of changes in the view property code

Change-Id: I57dc6e44838f4f4354f8977a3b542e93384b3d7d

1 files changed, 23 insertions, 15 deletions

diff --git a/res/layout-xlarge/launcher.xml b/res/layout-xlarge/launcher.xml
index f0564cab8..fa323fd0c 100644
--- a/res/layout-xlarge/launcher.xml
+++ b/res/layout-xlarge/launcher.xml
@@ -45,30 +45,38 @@
         <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:src="@drawable/search_button"
+
+        android:onClick="onClickSearchButton"
+        android:focusable="true"
+        android:clickable="true"
+        android:layout_gravity="top|left"/>
     <RelativeLayout
         android:id="@+id/all_apps_button_cluster"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="top|right">
-        <com.android.launcher2.HandleView
-            style="@style/HotseatButton"
-            android:id="@+id/all_apps_button"
-            android:layout_height="@dimen/button_bar_height"
-            android:layout_width="@dimen/button_bar_height"
-
-            android:src="@drawable/all_apps_button"
-            launcher:direction="horizontal"  />
         <ImageView
-            android:id="@+id/add_button"
+            android:id="@+id/configure_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_toRightOf="@id/all_apps_button"
+            android:src="@drawable/configure_button"
 
-            android:layout_centerVertical="true"
-            android:scaleType="center"
-            android:src="@drawable/add_button"
+            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="onClickAddButton"
+            android:onClick="onClickAllAppsButton"
             android:focusable="true"
             android:clickable="true" />
         <com.android.launcher2.DeleteZone
@@ -76,7 +84,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingTop="@dimen/delete_zone_padding"
-            android:layout_toRightOf="@id/all_apps_button"
+            android:layout_toRightOf="@id/configure_button"
 
             android:scaleType="center"
             android:src="@drawable/delete_zone_selector"