From cf69a29aebf61307ef333d141b403370628f2a60 Mon Sep 17 00:00:00 2001
From: sujinwen <sujinwen@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 25 七月 2017 15:28:05 +0800
Subject: [PATCH] Failed commit: Default

---
 VisitFace/DemoForBsk/app/build/intermediates/res/merged/debug/layout/abc_search_view.xml |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/VisitFace/DemoForBsk/app/build/intermediates/res/merged/debug/layout/abc_search_view.xml b/VisitFace/DemoForBsk/app/build/intermediates/res/merged/debug/layout/abc_search_view.xml
index 1d9a98b..0e1f36d 100644
--- a/VisitFace/DemoForBsk/app/build/intermediates/res/merged/debug/layout/abc_search_view.xml
+++ b/VisitFace/DemoForBsk/app/build/intermediates/res/merged/debug/layout/abc_search_view.xml
@@ -47,8 +47,11 @@
     <LinearLayout
             android:id="@+id/search_edit_frame"
             android:layout_width="wrap_content"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:layout_weight="1"
+            android:layout_gravity="center_vertical"
+            android:layout_marginTop="4dip"
+            android:layout_marginBottom="4dip"
             android:layout_marginLeft="8dip"
             android:layout_marginRight="8dip"
             android:orientation="horizontal"
@@ -67,7 +70,7 @@
         <LinearLayout
                 android:id="@+id/search_plate"
                 android:layout_width="wrap_content"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:layout_gravity="center_vertical"
                 android:orientation="horizontal">
@@ -77,7 +80,8 @@
                   android:layout_height="36dip"
                   android:layout_width="0dp"
                   android:layout_weight="1"
-                  android:layout_gravity="center_vertical"
+                  android:minWidth="@dimen/abc_search_view_text_min_width"
+                  android:layout_gravity="bottom"
                   android:paddingLeft="@dimen/abc_dropdownitem_text_padding_left"
                   android:paddingRight="@dimen/abc_dropdownitem_text_padding_right"
                   android:singleLine="true"
@@ -135,3 +139,4 @@
         </LinearLayout>
     </LinearLayout>
 </LinearLayout>
+<!-- From: file:/usr/local/google/buildbot/repo_clients/https___googleplex-android.googlesource.com_a_platform_manifest.git/mnc-supportlib-release/frameworks/support/v7/appcompat/res/layout/abc_search_view.xml -->
\ No newline at end of file

--
Gitblit v1.8.0