summaryrefslogtreecommitdiffstats
path: root/res/layout-xlarge-port
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2010-11-16 09:05:07 -0800
committerAmith Yamasani <yamasani@google.com>2010-11-17 16:46:14 -0800
commit6d7fe506fcfbc7bd6810ec8dd48c214e856aa87a (patch)
tree0d3d3027cfcbcbe03810480304ccca228aefa7fc /res/layout-xlarge-port
parentf74a4ecf9453c84f46543ed8528916029501d13e (diff)
downloadandroid_packages_apps_Trebuchet-6d7fe506fcfbc7bd6810ec8dd48c214e856aa87a.tar.gz
android_packages_apps_Trebuchet-6d7fe506fcfbc7bd6810ec8dd48c214e856aa87a.tar.bz2
android_packages_apps_Trebuchet-6d7fe506fcfbc7bd6810ec8dd48c214e856aa87a.zip
Separate QSB and Voice buttons, aligned with QSB app.
Add EditText style underscores for the icons. Get VoiceSearch icon from the activity that handles the RecognizerIntent.ACTION_WEB_SEARCH
Diffstat (limited to 'res/layout-xlarge-port')
-rw-r--r--res/layout-xlarge-port/launcher.xml56
1 files changed, 47 insertions, 9 deletions
diff --git a/res/layout-xlarge-port/launcher.xml b/res/layout-xlarge-port/launcher.xml
index a6fff4a58..c2ca4679c 100644
--- a/res/layout-xlarge-port/launcher.xml
+++ b/res/layout-xlarge-port/launcher.xml
@@ -54,16 +54,54 @@
android:layout_height="?android:attr/actionBarSize"
android:layout_gravity="top">
- <ImageView
- android:id="@+id/search_button"
+ <LinearLayout android:id="@+id/search_button_cluster"
android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:layout_gravity="left"
- android:layout_marginLeft="@dimen/toolbar_button_spacing"
-
- android:onClick="onClickSearchButton"
- android:focusable="true"
- android:clickable="true"/>
+ android:layout_height="48dp"
+ android:gravity="bottom"
+ >
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_marginLeft="16dp"
+ android:background="@drawable/textfield_start"
+ android:orientation="horizontal">
+ <!-- Global search icon -->
+ <ImageView
+ android:id="@+id/search_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="bottom"
+ android:paddingLeft="8dp"
+ android:paddingRight="8dp"
+ android:paddingTop="12dp"
+ android:src="@drawable/search_button_generic"
+ android:background="@drawable/button_bg"
+ android:onClick="onClickSearchButton"
+ android:focusable="true"
+ android:clickable="true"/>
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:background="@drawable/textfield_end"
+ android:orientation="horizontal">
+ <!-- Voice search icon -->
+ <ImageView
+ android:id="@+id/voice_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="bottom"
+ android:paddingLeft="8dp"
+ android:paddingRight="8dp"
+ android:paddingTop="12dp"
+ android:src="@drawable/ic_voice_search"
+ android:background="@drawable/button_bg"
+ android:onClick="onClickVoiceButton"
+ android:focusable="true"
+ android:clickable="true"/>
+ </LinearLayout>
+ </LinearLayout>
<ImageView
android:id="@+id/configure_button"