Updating assets.

- Tweaking search bar layout.

Change-Id: I9624fa4284135858d3e19b8b8e4710b5dd746042

2 files changed, 61 insertions, 10 deletions

diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml
index d2f52c839..c120de8f9 100644
--- a/res/layout-land/launcher.xml
+++ b/res/layout-land/launcher.xml
@@ -40,22 +40,18 @@
         <include android:id="@+id/cell5" layout="@layout/workspace_screen" />
     </com.android.launcher2.Workspace>
 
-    <ImageView
+    <include
         android:id="@+id/paged_view_indicator_track"
+        layout="@layout/scroll_indicator_track"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="bottom"
-        android:scaleType="fitXY"
-        android:src="@drawable/hotseat_track_holo" />
-    <ImageView
+        android:layout_gravity="bottom" />
+    <include
         android:id="@+id/paged_view_indicator"
+        layout="@layout/scroll_indicator"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="bottom"
-        android:visibility="gone"
-        android:alpha="0"
-        android:scaleType="fitXY"
-        android:src="@drawable/hotseat_scrubber_holo" />
+        android:layout_gravity="bottom" />
 
     <include layout="@layout/qsb_bar"
         android:id="@+id/qsb_bar"
diff --git a/res/layout-land/search_bar.xml b/res/layout-land/search_bar.xml
new file mode 100644
index 000000000..e3f67a1f2
--- /dev/null
+++ b/res/layout-land/search_bar.xml
@@ -0,0 +1,55 @@
+<?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.
+-->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+    style="@style/SearchDropTargetBar"
+    android:layout_width="@dimen/qsb_bar_height"
+    android:layout_height="match_parent">
+   <!-- Global search icon -->
+   <ImageView
+        style="@style/SearchButton"
+        android:id="@+id/search_button"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:src="@drawable/ic_search_normal_holo"
+        android:background="@drawable/button_bg"
+        android:onClick="onClickSearchButton"
+        android:focusable="true"
+        android:clickable="true"
+        android:contentDescription="@string/accessibility_search_button" />
+
+    <ImageView
+        style="@style/SearchButtonDivider"
+        android:id="@+id/search_divider"
+        android:src="@drawable/divider_launcher_holo"
+        android:onClick="onClickSearchButton"
+        android:focusable="false"
+        android:clickable="true" />
+
+    <!-- Voice search icon -->
+    <ImageView
+        style="@style/SearchButton"
+        android:id="@+id/voice_button"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:src="@drawable/ic_voice_search_holo"
+        android:background="@drawable/button_bg"
+        android:onClick="onClickVoiceButton"
+        android:focusable="true"
+        android:clickable="true"
+        android:contentDescription="@string/accessibility_voice_search_button" />
+</LinearLayout>
\ No newline at end of file