summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2016-07-21 10:42:30 -0700
committerSunny Goyal <sunnygoyal@google.com>2016-07-22 13:17:30 -0700
commitce3fffb5fb446e031e52ee0c5f2a4a5cf86a8c81 (patch)
tree7f95627d9e96e445b5dc9f03d6ed2a02eca408f3 /res
parent58368b15152052fb479891f0d3aba30ab3794fba (diff)
downloadandroid_packages_apps_Trebuchet-ce3fffb5fb446e031e52ee0c5f2a4a5cf86a8c81.tar.gz
android_packages_apps_Trebuchet-ce3fffb5fb446e031e52ee0c5f2a4a5cf86a8c81.tar.bz2
android_packages_apps_Trebuchet-ce3fffb5fb446e031e52ee0c5f2a4a5cf86a8c81.zip
Updating the search hint to contain the icon as a span object.
This makes the icon part of the hint text, and removes any need for custom focus event handling. Also the icon will now appear at the start of the text based on the direction of the text and not the direction of the layout Change-Id: I06c5cf99492d75b1005c69ec7c521cde0fdab010
Diffstat (limited to 'res')
-rw-r--r--res/layout/all_apps.xml14
1 files changed, 1 insertions, 13 deletions
diff --git a/res/layout/all_apps.xml b/res/layout/all_apps.xml
index 822c8b687..5c2c4b869 100644
--- a/res/layout/all_apps.xml
+++ b/res/layout/all_apps.xml
@@ -65,18 +65,6 @@
android:orientation="horizontal"
android:saveEnabled="false">
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:gravity="center_vertical"
- android:id="@+id/search_hint"
- android:layout_gravity="center_horizontal"
- android:drawablePadding="@dimen/all_apps_search_bar_icon_margin_right"
- android:drawableStart="@drawable/ic_allapps_search"
- android:text="@string/all_apps_search_bar_hint"
- android:textColor="@drawable/all_apps_search_hint"
- android:textSize="16sp" />
-
<com.android.launcher3.ExtendedEditText
android:id="@+id/search_box_input"
android:layout_width="match_parent"
@@ -90,7 +78,7 @@
android:scrollHorizontally="true"
android:singleLine="true"
android:textColor="#4c4c4c"
- android:contentDescription="@string/all_apps_search_bar_hint"
+ android:hint="@string/all_apps_search_bar_hint"
android:textColorHint="@drawable/all_apps_search_hint"
android:textSize="16sp" />
</FrameLayout>