summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorcalderwoodra <calderwoodra@google.com>2017-10-12 00:50:28 -0700
committerEric Erfanian <erfanian@google.com>2017-10-12 14:31:52 -0700
commitac7ab398262a92c33735fe0d93b029bf8aba548f (patch)
tree45ab798e47ba027c97e49b1ec1c80e73a0ac6a34 /java
parent9982f0db5e9b74a66d22befa113073c9cfcd221e (diff)
Updated animation to enter and exit search ui.
video: https://drive.google.com/open?id=0B2Hce9qilHmvZkREWm1BMURJNjQ Bug: 67635181 Test: n/a PiperOrigin-RevId: 171928416 Change-Id: Id0ef91647ec15ea970a691b1ae896010a12e6bb8
Diffstat (limited to 'java')
-rw-r--r--java/com/android/dialer/app/res/layout/search_edittext.xml1
-rw-r--r--java/com/android/dialer/app/widget/SearchEditTextLayout.java1
2 files changed, 1 insertions, 1 deletions
diff --git a/java/com/android/dialer/app/res/layout/search_edittext.xml b/java/com/android/dialer/app/res/layout/search_edittext.xml
index 63786dfb0..5fc492d29 100644
--- a/java/com/android/dialer/app/res/layout/search_edittext.xml
+++ b/java/com/android/dialer/app/res/layout/search_edittext.xml
@@ -39,6 +39,7 @@
android:layout_width="@dimen/search_box_icon_size"
android:layout_height="@dimen/search_box_icon_size"
android:layout_marginStart="8dp"
+ android:layout_centerVertical="true"
android:importantForAccessibility="no"
android:scaleType="center"
android:src="@drawable/quantum_ic_search_vd_theme_24"
diff --git a/java/com/android/dialer/app/widget/SearchEditTextLayout.java b/java/com/android/dialer/app/widget/SearchEditTextLayout.java
index 95bd12aa1..9da0e245f 100644
--- a/java/com/android/dialer/app/widget/SearchEditTextLayout.java
+++ b/java/com/android/dialer/app/widget/SearchEditTextLayout.java
@@ -274,7 +274,6 @@ public class SearchEditTextLayout extends FrameLayout {
mCollapsedSearchBox.setVisibility(collapsedViewVisibility);
mVoiceSearchButtonView.setVisibility(collapsedViewVisibility);
mOverflowButtonView.setVisibility(collapsedViewVisibility);
- mBackButtonView.setVisibility(expandedViewVisibility);
// TODO: Prevents keyboard from jumping up in landscape mode after exiting the
// SearchFragment when the query string is empty. More elegant fix?
//mExpandedSearchBox.setVisibility(expandedViewVisibility);