summaryrefslogtreecommitdiff
path: root/java/com/android/dialer/main/impl/toolbar/res/layout
diff options
context:
space:
mode:
authorcalderwoodra <calderwoodra@google.com>2018-02-12 02:07:28 -0800
committerCopybara-Service <copybara-piper@google.com>2018-02-12 11:42:45 -0800
commit814a5b4894426eea6d178018df767c22a5453c4d (patch)
treeb2e81c067aa0a1609cc44878f028472b9cbec5c1 /java/com/android/dialer/main/impl/toolbar/res/layout
parentcdcda1a127c4841c2710c17f64a2f522c62cd512 (diff)
Fixed some search UI nits.
- Search bar text no longer extends underneath the X/clear button. - Dialpad text is now preserved when it is lowered then raised again without leaving the search UI. - Search bar now has a shadow in the search UI Bug: 73088433 Test: tests for dialpad text logic PiperOrigin-RevId: 185350273 Change-Id: Ie4c968cba4f187af81121aa40d43c26a762cdd2b
Diffstat (limited to 'java/com/android/dialer/main/impl/toolbar/res/layout')
-rw-r--r--java/com/android/dialer/main/impl/toolbar/res/layout/expanded_search_bar.xml2
-rw-r--r--java/com/android/dialer/main/impl/toolbar/res/layout/toolbar_layout.xml1
2 files changed, 1 insertions, 2 deletions
diff --git a/java/com/android/dialer/main/impl/toolbar/res/layout/expanded_search_bar.xml b/java/com/android/dialer/main/impl/toolbar/res/layout/expanded_search_bar.xml
index 4dbd4bf22..4e49accae 100644
--- a/java/com/android/dialer/main/impl/toolbar/res/layout/expanded_search_bar.xml
+++ b/java/com/android/dialer/main/impl/toolbar/res/layout/expanded_search_bar.xml
@@ -36,7 +36,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_toEndOf="@+id/search_back_button"
- android:layout_toStartOf="@+id/search_close_button"
+ android:layout_toStartOf="@+id/search_clear_button"
android:layout_centerVertical="true"
android:layout_marginStart="8dp"
android:minHeight="48dp"
diff --git a/java/com/android/dialer/main/impl/toolbar/res/layout/toolbar_layout.xml b/java/com/android/dialer/main/impl/toolbar/res/layout/toolbar_layout.xml
index 7c4cee2b3..59cc35451 100644
--- a/java/com/android/dialer/main/impl/toolbar/res/layout/toolbar_layout.xml
+++ b/java/com/android/dialer/main/impl/toolbar/res/layout/toolbar_layout.xml
@@ -16,7 +16,6 @@
<com.android.dialer.main.impl.toolbar.MainToolbar
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
- android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@color/dialer_theme_color"