diff options
| author | Michael Kolb <kolby@google.com> | 2012-06-05 09:21:22 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-05 09:21:22 -0700 |
| commit | 1d8dca8ce9fd2bfc798d331e5e15e0b5ba2d1a50 (patch) | |
| tree | 708a5bdaae3c1a3de5b955e0c88131396114036c /res | |
| parent | 6b3a9da4a0101a0dd0b49bf604237368a2375988 (diff) | |
| parent | 80f6d0574a9655fac3bd219afcb1810d0f66a57f (diff) | |
| download | packages_apps_browser-1d8dca8ce9fd2bfc798d331e5e15e0b5ba2d1a50.zip packages_apps_browser-1d8dca8ce9fd2bfc798d331e5e15e0b5ba2d1a50.tar.gz packages_apps_browser-1d8dca8ce9fd2bfc798d331e5e15e0b5ba2d1a50.tar.bz2 | |
am 80f6d057: am 3c573ac4: Merge "Enable voice search in omnibox" into jb-dev
* commit '80f6d0574a9655fac3bd219afcb1810d0f66a57f':
Enable voice search in omnibox
Diffstat (limited to 'res')
| -rw-r--r-- | res/drawable-hdpi/ic_voice_search_holo_dark.png | bin | 0 -> 961 bytes | |||
| -rw-r--r-- | res/drawable-mdpi/ic_voice_search_holo_dark.png | bin | 0 -> 687 bytes | |||
| -rw-r--r-- | res/drawable-xhdpi/ic_voice_search_holo_dark.png | bin | 0 -> 1239 bytes | |||
| -rw-r--r-- | res/layout-sw600dp/title_bar_nav.xml | 9 | ||||
| -rw-r--r-- | res/layout/title_bar_nav.xml | 9 |
5 files changed, 17 insertions, 1 deletions
diff --git a/res/drawable-hdpi/ic_voice_search_holo_dark.png b/res/drawable-hdpi/ic_voice_search_holo_dark.png Binary files differnew file mode 100644 index 0000000..e79aa71 --- /dev/null +++ b/res/drawable-hdpi/ic_voice_search_holo_dark.png diff --git a/res/drawable-mdpi/ic_voice_search_holo_dark.png b/res/drawable-mdpi/ic_voice_search_holo_dark.png Binary files differnew file mode 100644 index 0000000..f809e52 --- /dev/null +++ b/res/drawable-mdpi/ic_voice_search_holo_dark.png diff --git a/res/drawable-xhdpi/ic_voice_search_holo_dark.png b/res/drawable-xhdpi/ic_voice_search_holo_dark.png Binary files differnew file mode 100644 index 0000000..02876b7 --- /dev/null +++ b/res/drawable-xhdpi/ic_voice_search_holo_dark.png 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" |
