summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorAndrew Lee <anwlee@google.com>2014-05-16 19:55:06 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-05-16 19:55:07 +0000
commit92f82623d97e17ecb3a22f8a921bf4657534168b (patch)
treefadd8b47ba2609de2dd3288a3f806c7dded71c3e /res
parentcb782e57c5cb6802584b224911984bddbc85a989 (diff)
parentb19038436ce8e4683eb19af02255eda9969a6a94 (diff)
Merge "Open search ui on touch, and handle related scenarios."
Diffstat (limited to 'res')
-rw-r--r--res/layout/search_edittext.xml4
-rw-r--r--res/values/attrs.xml2
2 files changed, 4 insertions, 2 deletions
diff --git a/res/layout/search_edittext.xml b/res/layout/search_edittext.xml
index 236d2bf93..f44cc0b6d 100644
--- a/res/layout/search_edittext.xml
+++ b/res/layout/search_edittext.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<view class="com.android.dialer.widget.SearchEditTextLayout"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -45,4 +45,4 @@
android:clickable="true"
android:contentDescription="@string/description_start_voice_search"
android:background="?android:attr/selectableItemBackground" />
-</LinearLayout> \ No newline at end of file
+</view> \ No newline at end of file
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index f734aae89..23f639fd2 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -31,4 +31,6 @@
<attr name="call_log_voicemail_status_action_text_color" format="color" />
</declare-styleable>
+ <declare-styleable name="SearchEditTextLayout" />
+
</resources>