diff options
| author | Yorke Lee <yorkelee@google.com> | 2013-10-04 11:08:40 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-04 11:08:40 -0700 |
| commit | ad8390e35c04faf984104b45606539a9fbb83b83 (patch) | |
| tree | fdf87f5a5ffdce0624fd3b510807769957d19817 | |
| parent | 1b419dded37db06933871c78f814cc8c324a750c (diff) | |
| parent | 1e1d34534f36be66a27ae03d03de6dcea271edad (diff) | |
am 1e1d3453: am a028ca2c: am 50893bea: Merge "Fix divider view not animating" into klp-dev
* commit '1e1d34534f36be66a27ae03d03de6dcea271edad':
Fix divider view not animating
| -rw-r--r-- | res/layout/dialtacts_activity.xml | 76 |
1 files changed, 41 insertions, 35 deletions
diff --git a/res/layout/dialtacts_activity.xml b/res/layout/dialtacts_activity.xml index fe1e644b0..e0eb41b99 100644 --- a/res/layout/dialtacts_activity.xml +++ b/res/layout/dialtacts_activity.xml @@ -31,43 +31,49 @@ <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingLeft="16dp" - android:paddingRight="23dp" android:id="@+id/search_view_container" - android:background="@color/searchbox_background_color" - android:orientation="horizontal" - android:gravity="center_vertical"> - <EditText - android:id="@+id/search_view" - android:layout_width="0dp" - android:layout_height="56dp" - android:layout_weight="1" - android:textSize="@dimen/search_text_size" - android:inputType="textFilter"/> - <ImageView - android:id="@+id/search_close_button" - android:layout_height="40dp" - android:layout_width="40dp" - android:padding="6dp" - android:src="@drawable/ic_close_dk" - android:clickable="true" - android:background="?android:attr/selectableItemBackground" - android:visibility="gone" /> - <ImageView - android:id="@+id/voice_search_button" - android:layout_height="40dp" - android:layout_width="40dp" - android:padding="6dp" - android:src="@drawable/ic_voice_search" - android:clickable="true" - android:contentDescription="@string/description_start_voice_search" - android:background="?android:attr/selectableItemBackground" /> + android:orientation="vertical" + > + <LinearLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="horizontal" + android:paddingLeft="16dp" + android:paddingRight="23dp" + android:background="@color/searchbox_background_color" + android:gravity="center_vertical"> + <EditText + android:id="@+id/search_view" + android:layout_width="0dp" + android:layout_height="56dp" + android:layout_weight="1" + android:textSize="@dimen/search_text_size" + android:inputType="textFilter"/> + <ImageView + android:id="@+id/search_close_button" + android:layout_height="40dp" + android:layout_width="40dp" + android:padding="6dp" + android:src="@drawable/ic_close_dk" + android:clickable="true" + android:background="?android:attr/selectableItemBackground" + android:visibility="gone" /> + <ImageView + android:id="@+id/voice_search_button" + android:layout_height="40dp" + android:layout_width="40dp" + android:padding="6dp" + android:src="@drawable/ic_voice_search" + android:clickable="true" + android:contentDescription="@string/description_start_voice_search" + android:background="?android:attr/selectableItemBackground" /> + </LinearLayout> + <View + android:id="@+id/searchbox_divider" + android:layout_height="1dp" + android:layout_width="match_parent" + android:background="@color/background_dialer_light" /> </LinearLayout> - <View - android:id="@+id/searchbox_divider" - android:layout_height="1dp" - android:layout_width="match_parent" - android:background="@color/background_dialer_light" /> <FrameLayout android:layout_height="0dp" android:layout_weight="1" |