diff options
| author | Peter Schiller <peterschiller@google.com> | 2016-07-14 23:40:39 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-07-14 23:40:40 +0000 |
| commit | c9dec56c27c9ad53a64196bcfa38f77ec033d65c (patch) | |
| tree | cb86519832ffc46867e6937497d9c94b2eea1273 /res/layout/all_apps.xml | |
| parent | 857bfcf3247ef765e16ce595c10e4c1fa5c2a69b (diff) | |
| parent | 5024503702fa464cb5722a1893118a9a0ea32c3b (diff) | |
| download | android_packages_apps_Trebuchet-c9dec56c27c9ad53a64196bcfa38f77ec033d65c.tar.gz android_packages_apps_Trebuchet-c9dec56c27c9ad53a64196bcfa38f77ec033d65c.tar.bz2 android_packages_apps_Trebuchet-c9dec56c27c9ad53a64196bcfa38f77ec033d65c.zip | |
Merge "Preventing unnecessary layouts on search focus change" into ub-launcher3-calgary
Diffstat (limited to 'res/layout/all_apps.xml')
| -rw-r--r-- | res/layout/all_apps.xml | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/res/layout/all_apps.xml b/res/layout/all_apps.xml index c4c6aab39..ad1fa8280 100644 --- a/res/layout/all_apps.xml +++ b/res/layout/all_apps.xml @@ -57,7 +57,7 @@ android:focusable="true" android:theme="@style/CustomOverscroll.Light" /> - <LinearLayout + <FrameLayout android:id="@+id/search_container" android:layout_width="match_parent" android:layout_height="@dimen/all_apps_search_bar_height" @@ -66,25 +66,28 @@ android:paddingRight="@dimen/container_fastscroll_thumb_max_width" android:gravity="center|bottom" android:orientation="horizontal" - android:saveEnabled="false"> + android:saveEnabled="false" + android:paddingTop="@dimen/all_apps_search_bar_margin_top" > - <ImageView - android:id="@+id/search_icon" + <TextView android:layout_width="wrap_content" android:layout_height="match_parent" - android:scaleType="fitCenter" - android:layout_marginTop="@dimen/all_apps_search_bar_icon_margin_top" - android:paddingEnd="@dimen/all_apps_search_bar_icon_margin_right" - android:src="@drawable/ic_allapps_search" /> + android:gravity="center_vertical" + android:id="@+id/search_hint" + android:layout_gravity="center_horizontal" + android:drawablePadding="@dimen/all_apps_search_bar_icon_margin_right" + android:drawableStart="@drawable/ic_allapps_search" + android:text="@string/all_apps_search_bar_hint" + android:textColor="@drawable/all_apps_search_hint" + android:textSize="16sp" /> <com.android.launcher3.ExtendedEditText android:id="@+id/search_box_input" - android:layout_width="wrap_content" + android:layout_width="match_parent" android:layout_height="match_parent" android:background="@android:color/transparent" android:focusableInTouchMode="true" android:gravity="start|center_vertical" - android:hint="@string/all_apps_search_bar_hint" android:imeOptions="actionSearch|flagNoExtractUi" android:inputType="text|textNoSuggestions|textCapWords" android:maxLines="1" @@ -93,7 +96,7 @@ android:textColor="#4c4c4c" android:textColorHint="@drawable/all_apps_search_hint" android:textSize="16sp" /> - </LinearLayout> + </FrameLayout> </com.android.launcher3.allapps.AllAppsRecyclerViewContainerView> <View |