summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2013-09-27 11:44:58 -0700
committerWinson Chung <winsonc@google.com>2013-09-27 11:44:58 -0700
commit54e65135548818cb2fa8522b27df92c0aaa3e4a7 (patch)
treeac166964f0597e1d81d5f09ce4f080760ad15ddd /res
parenta6125efb66dd7554f2a84804baf6cc02a1334f20 (diff)
downloadandroid_packages_apps_Trebuchet-54e65135548818cb2fa8522b27df92c0aaa3e4a7.tar.gz
android_packages_apps_Trebuchet-54e65135548818cb2fa8522b27df92c0aaa3e4a7.tar.bz2
android_packages_apps_Trebuchet-54e65135548818cb2fa8522b27df92c0aaa3e4a7.zip
Ensuring that Launcher always has a search bar. (Bug 10965514)
- Also disabling voice proxy when we are in now (Bug 10915381) Change-Id: I4ad6392b5139d12b9b298110109b9363ba426cb4
Diffstat (limited to 'res')
-rw-r--r--res/layout-port/launcher.xml2
-rw-r--r--res/layout-port/search_bar.xml2
2 files changed, 4 insertions, 0 deletions
diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml
index ef2f3ace1..6638143f0 100644
--- a/res/layout-port/launcher.xml
+++ b/res/layout-port/launcher.xml
@@ -85,6 +85,8 @@
android:layout_height="match_parent"
android:visibility="gone" />
+ <!-- This is the search bar voice button proxy view. It allows us to have a larger
+ touch target than the microphone constrained by the search bar bounds. -->
<com.android.launcher3.DrawableStateProxyView
android:id="@+id/voice_button_proxy"
android:layout_width="0dp"
diff --git a/res/layout-port/search_bar.xml b/res/layout-port/search_bar.xml
index 69dd61aa2..1c96ca380 100644
--- a/res/layout-port/search_bar.xml
+++ b/res/layout-port/search_bar.xml
@@ -17,6 +17,8 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3"
style="@style/SearchDropTargetBar"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:background="@drawable/search_frame">
<!-- Global search icon -->
<com.android.launcher3.HolographicLinearLayout