From 0b12912da64ff5b2917d4f50eb91df2e76457d08 Mon Sep 17 00:00:00 2001
From: Michael Kolb <kolby@google.com>
Date: Mon, 4 Jun 2012 16:31:58 -0700
Subject: Enable voice search in omnibox

  Bug: 6601348

Bring back voice search. Also fixes focus bug for fixed titlebar.

Change-Id: I83c8ad96957b62c23ad0bbb35685712687d11213
---
 res/drawable-hdpi/ic_voice_search_holo_dark.png  | Bin 0 -> 961 bytes
 res/drawable-mdpi/ic_voice_search_holo_dark.png  | Bin 0 -> 687 bytes
 res/drawable-xhdpi/ic_voice_search_holo_dark.png | Bin 0 -> 1239 bytes
 res/layout-sw600dp/title_bar_nav.xml             |   9 ++++++++-
 res/layout/title_bar_nav.xml                     |   9 +++++++++
 5 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 res/drawable-hdpi/ic_voice_search_holo_dark.png
 create mode 100644 res/drawable-mdpi/ic_voice_search_holo_dark.png
 create mode 100644 res/drawable-xhdpi/ic_voice_search_holo_dark.png

(limited to 'res')

diff --git a/res/drawable-hdpi/ic_voice_search_holo_dark.png b/res/drawable-hdpi/ic_voice_search_holo_dark.png
new file mode 100644
index 0000000..e79aa71
Binary files /dev/null and b/res/drawable-hdpi/ic_voice_search_holo_dark.png differ
diff --git a/res/drawable-mdpi/ic_voice_search_holo_dark.png b/res/drawable-mdpi/ic_voice_search_holo_dark.png
new file mode 100644
index 0000000..f809e52
Binary files /dev/null and b/res/drawable-mdpi/ic_voice_search_holo_dark.png differ
diff --git a/res/drawable-xhdpi/ic_voice_search_holo_dark.png b/res/drawable-xhdpi/ic_voice_search_holo_dark.png
new file mode 100644
index 0000000..02876b7
Binary files /dev/null and b/res/drawable-xhdpi/ic_voice_search_holo_dark.png differ
diff --git a/res/layout-sw600dp/title_bar_nav.xml b/res/layout-sw600dp/title_bar_nav.xml
index 651474a..a6b8a32 100644
--- a/res/layout-sw600dp/title_bar_nav.xml
+++ b/res/layout-sw600dp/title_bar_nav.xml
@@ -98,7 +98,14 @@
             android:layout_height="match_parent"
             android:contentDescription="@string/accessibility_button_clear"
             style="@style/HoloButton" />
-    </LinearLayout>
+        <ImageButton
+            android:id="@+id/voice"
+            android:src="@drawable/ic_voice_search_holo_dark"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:contentDescription="@string/accessibility_button_voice"
+            style="@style/HoloButton" />
+        </LinearLayout>
     <ImageButton
         android:id="@+id/search"
         android:src="@drawable/ic_search_holo_dark"
diff --git a/res/layout/title_bar_nav.xml b/res/layout/title_bar_nav.xml
index 31e47bc..15568c3 100644
--- a/res/layout/title_bar_nav.xml
+++ b/res/layout/title_bar_nav.xml
@@ -89,6 +89,15 @@
             style="@style/Suggestions"
             android:background="@null" />
         <ImageView
+            android:id="@+id/voice"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:paddingRight="4dip"
+            android:contentDescription="@string/accessibility_button_voice"
+            android:src="@drawable/ic_voice_search_holo_dark"
+            style="@style/HoloButton"
+            android:visibility="gone" />
+        <ImageView
             android:id="@+id/clear"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-- 
cgit v1.1