resolved conflicts for merge of a3e22d6a to master

Change-Id: I8770574acf86e280a9d15d4309686111260e09d9

1 files changed, 74 insertions, 0 deletions

diff --git a/res/layout-sw720dp/search_bar.xml b/res/layout-sw720dp/search_bar.xml
new file mode 100644
index 000000000..55ec959de
--- /dev/null
+++ b/res/layout-sw720dp/search_bar.xml
@@ -0,0 +1,74 @@
+<?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.
+-->
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/SearchDropTargetBar"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+   <!-- Global search icon -->
+   <com.android.launcher2.HolographicImageView
+        style="@style/SearchButton"
+        android:id="@+id/search_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentTop="true"
+        android:src="@drawable/ic_home_search_normal_holo"
+        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:layout_toRightOf="@+id/search_button"
+        android:src="@drawable/divider_launcher_holo"
+        android:onClick="onClickSearchButton"
+        android:focusable="false"
+        android:clickable="true" />
+
+    <!-- Voice search icon -->
+    <com.android.launcher2.HolographicImageView
+        style="@style/SearchButton.Voice"
+        android:id="@+id/voice_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_toRightOf="@+id/search_divider"
+        android:src="@drawable/ic_home_voice_search_holo"
+        android:onClick="onClickVoiceButton"
+        android:focusable="true"
+        android:clickable="true"
+        android:contentDescription="@string/accessibility_voice_search_button" />
+
+    <!-- AppsCustomize icon -->
+    <com.android.launcher2.HolographicImageView
+        android:id="@+id/all_apps_button"
+        android:onClick="onClickAllAppsButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentTop="true"
+        android:paddingLeft="@dimen/toolbar_button_horizontal_padding"
+        android:paddingRight="@dimen/toolbar_button_horizontal_padding"
+        android:paddingTop="@dimen/all_apps_button_vertical_padding"
+        android:paddingBottom="@dimen/all_apps_button_vertical_padding"
+        android:src="@drawable/ic_home_all_apps_holo_dark"
+
+        android:focusable="true"
+        android:clickable="true"
+        android:contentDescription="@string/accessibility_all_apps_button" />
+</RelativeLayout>