Initial changes to add configurable hotseat.

Change-Id: I4c2ed4a1c122c057662fabc70bfef7c5c088460b

3 files changed, 42 insertions, 26 deletions

diff --git a/res/layout-port/hotseat.xml b/res/layout-port/hotseat.xml
new file mode 100644
index 000000000..88dd73867
--- /dev/null
+++ b/res/layout-port/hotseat.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<com.android.launcher2.Hotseat
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+    android:background="@drawable/hotseat_bg_panel"
+    launcher:cellCountX="-1"
+    launcher:cellCountY="1">
+    <com.android.launcher2.CellLayout
+        android:id="@+id/layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingLeft="@dimen/workspace_left_padding"
+        android:paddingRight="@dimen/workspace_right_padding"
+        launcher:cellWidth="@dimen/workspace_cell_width"
+        launcher:cellHeight="@dimen/workspace_cell_height"
+        launcher:widthGap="-1dp"
+        launcher:heightGap="-1dp"
+        launcher:maxGap="@dimen/workspace_max_gap" />
+</com.android.launcher2.Hotseat>
\ No newline at end of file
diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml
index d9750dbd2..fc39034f5 100644
--- a/res/layout-port/launcher.xml
+++ b/res/layout-port/launcher.xml
@@ -68,31 +68,12 @@
         android:layout_height="match_parent"
         android:visibility="invisible" />
 
-    <RelativeLayout
-        android:id="@+id/all_apps_button_cluster"
-        android:layout_width="fill_parent"
+    <include layout="@layout/hotseat"
+        android:id="@+id/hotseat"
+        android:layout_width="match_parent"
         android:layout_height="@dimen/button_bar_height"
-        android:layout_gravity="bottom|center_horizontal"
-        android:paddingTop="2dip">
-        <ImageView
-            android:id="@+id/hotseat_left"
-            style="@style/HotseatButton.Left"
-            android:layout_toLeftOf="@id/all_apps_button"
-            android:src="@drawable/hotseat_phone"
-            android:onClick="launchHotSeat" />
-        <com.android.launcher2.HandleView
-            style="@style/HotseatButton"
-            android:id="@+id/all_apps_button"
-            android:layout_centerHorizontal="true"
-            android:layout_alignParentBottom="true"
-            android:src="@drawable/all_apps_button"
-            launcher:direction="horizontal" />
-        <ImageView
-            android:id="@+id/hotseat_right"
-            style="@style/HotseatButton.Right"
-            android:layout_toRightOf="@id/all_apps_button"
-            android:src="@drawable/hotseat_browser"
-            android:onClick="launchHotSeat" />
-    </RelativeLayout>
+        android:layout_gravity="bottom" />
+
+
 
 </com.android.launcher2.DragLayer>
diff --git a/res/layout-port/search_bar.xml b/res/layout-port/search_bar.xml
index f9a202ae0..0de290a04 100644
--- a/res/layout-port/search_bar.xml
+++ b/res/layout-port/search_bar.xml
@@ -36,7 +36,8 @@
             android:id="@+id/search_button"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:src="@drawable/ic_search_normal_holo" />
+            android:src="@drawable/ic_search_normal_holo"
+            android:adjustViewBounds="true" />
     </LinearLayout>
 
     <!-- Voice search icon -->
@@ -48,6 +49,7 @@
         android:layout_alignParentRight="true"
         android:layout_alignParentTop="true"
         android:src="@drawable/ic_voice_search_holo"
+        android:adjustViewBounds="true"
         android:background="@drawable/button_bg"
         android:onClick="onClickVoiceButton"
         android:focusable="true"