diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2018-03-01 14:55:22 -0800 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2018-03-01 15:58:11 -0800 |
commit | dbd6bb348c1c10e34d7488a741845648e1f7e88c (patch) | |
tree | eaf82b1ed13b9d67ae0a8eb73324ef4d27203715 /res/layout | |
parent | dd535466bf2ce88e07d489fa05a9caed274b028e (diff) | |
download | android_packages_apps_Trebuchet-dbd6bb348c1c10e34d7488a741845648e1f7e88c.tar.gz android_packages_apps_Trebuchet-dbd6bb348c1c10e34d7488a741845648e1f7e88c.tar.bz2 android_packages_apps_Trebuchet-dbd6bb348c1c10e34d7488a741845648e1f7e88c.zip |
Simplifying all-apps search box
> Giving the search box a solid background so that it work fine with scrolling
> bottom shadow logic for search box
Bug: 73085356
Change-Id: Ie4dc4922be39ffd8e2d562becedbd4c6f820e6c9
Diffstat (limited to 'res/layout')
-rw-r--r-- | res/layout/all_apps.xml | 2 | ||||
-rw-r--r-- | res/layout/search_container_all_apps.xml | 70 |
2 files changed, 21 insertions, 51 deletions
diff --git a/res/layout/all_apps.xml b/res/layout/all_apps.xml index 2ce6b8cfd..a7f0026a4 100644 --- a/res/layout/all_apps.xml +++ b/res/layout/all_apps.xml @@ -37,7 +37,7 @@ platform bug, which prevents using custom attributes in <include> tag --> <include android:id="@id/search_container_all_apps" - layout="?android:attr/keyboardLayout"/> + layout="@layout/search_container_all_apps"/> <View android:id="@+id/nav_bar_bg" diff --git a/res/layout/search_container_all_apps.xml b/res/layout/search_container_all_apps.xml index fc07002cb..14d7b53b6 100644 --- a/res/layout/search_container_all_apps.xml +++ b/res/layout/search_container_all_apps.xml @@ -17,53 +17,23 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:id="@id/search_container_all_apps" android:layout_width="match_parent" - android:layout_height="@dimen/all_apps_search_bar_height" - android:layout_gravity="center|top" - android:layout_marginBottom="-8dp" - android:gravity="center|bottom" - android:paddingLeft="@dimen/dynamic_grid_edge_margin" - android:paddingRight="@dimen/dynamic_grid_edge_margin" - android:saveEnabled="false" > - - <!-- - Note: The following relation should always be true so that the shadows are aligned properly - search_box_input.layout_marginBottom - == search_divider.layout_marginBottom - == - (search_container.layout_marginBottom) - >= 5dp - --> - <com.android.launcher3.ExtendedEditText - android:id="@+id/search_box_input" - android:layout_width="match_parent" - android:layout_height="@dimen/all_apps_search_bar_field_height" - android:layout_gravity="bottom" - android:layout_marginBottom="8dp" - android:background="@android:color/transparent" - android:focusableInTouchMode="true" - android:gravity="center" - android:hint="@string/all_apps_search_bar_hint" - android:imeOptions="actionSearch|flagNoExtractUi" - android:inputType="text|textNoSuggestions|textCapWords" - android:maxLines="1" - android:saveEnabled="false" - android:scrollHorizontally="true" - android:singleLine="true" - android:textColor="?android:attr/textColorSecondary" - android:textColorHint="@drawable/all_apps_search_hint" - android:textSize="16sp" /> - - <!-- This needs to be a container with a view, to simulate a scrolling effect for the header. - We translate the header down, and its content up by the same amount, so that it gets - clipped by the parent, making it look like the divider was scrolled out of the view. --> - <FrameLayout - android:id="@+id/search_divider" - android:layout_width="match_parent" - android:layout_height="1dp" - android:layout_gravity="bottom" - android:layout_marginBottom="8dp" > - <View - android:layout_width="match_parent" - android:layout_height="1dp" - android:background="@drawable/all_apps_search_divider"/> - </FrameLayout> -</com.android.launcher3.allapps.search.AppsSearchContainerLayout>
\ No newline at end of file + android:layout_height="@dimen/all_apps_search_bar_field_height" + android:layout_centerHorizontal="true" + android:layout_gravity="top|center_horizontal" + android:layout_marginTop="8dp" + android:background="@drawable/bg_all_apps_searchbox" + android:elevation="1dp" + android:focusableInTouchMode="true" + android:gravity="center" + android:hint="@string/all_apps_search_bar_hint" + android:imeOptions="actionSearch|flagNoExtractUi" + android:inputType="text|textNoSuggestions|textCapWords" + android:maxLines="1" + android:padding="8dp" + android:saveEnabled="false" + android:scrollHorizontally="true" + android:singleLine="true" + android:textColor="?android:attr/textColorSecondary" + android:textColorHint="@drawable/all_apps_search_hint" + android:textSize="16sp" + android:translationY="24dp" />
\ No newline at end of file |