diff options
Diffstat (limited to 'res/layout/apps_list_view.xml')
| -rw-r--r-- | res/layout/apps_list_view.xml | 43 |
1 files changed, 25 insertions, 18 deletions
diff --git a/res/layout/apps_list_view.xml b/res/layout/apps_list_view.xml index ddcb639b8..ef20323c1 100644 --- a/res/layout/apps_list_view.xml +++ b/res/layout/apps_list_view.xml @@ -13,20 +13,37 @@ See the License for the specific language governing permissions and limitations under the License. --> -<LinearLayout +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/apps_list" android:layout_width="match_parent" android:layout_height="match_parent" - android:orientation="vertical" android:elevation="15dp" android:visibility="gone" android:focusableInTouchMode="true"> + <com.android.launcher3.AppsContainerRecyclerView + android:id="@+id/apps_list_view" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_marginTop="@dimen/apps_search_bar_height" + android:layout_gravity="center_horizontal|top" + android:clipToPadding="false" + android:focusable="true" + android:descendantFocusability="afterDescendants" /> + <LinearLayout + android:id="@+id/prediction_bar" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/apps_search_bar_height" + android:orientation="horizontal" + android:visibility="invisible"> + </LinearLayout> + + <!-- We always want the search bar on top, so it goes last. --> <FrameLayout android:id="@+id/header" android:layout_width="match_parent" android:layout_height="@dimen/apps_search_bar_height" - android:orientation="horizontal" android:background="@drawable/apps_search_bg"> <LinearLayout android:id="@+id/app_search_container" @@ -40,8 +57,8 @@ android:layout_height="wrap_content" android:layout_gravity="start|center_vertical" android:layout_marginStart="4dp" - android:paddingTop="12dp" - android:paddingBottom="12dp" + android:paddingTop="13dp" + android:paddingBottom="13dp" android:contentDescription="@string/all_apps_button_label" android:src="@drawable/ic_arrow_back_grey" /> <com.android.launcher3.AppsContainerSearchEditTextView @@ -69,19 +86,9 @@ android:layout_height="wrap_content" android:layout_gravity="end|center_vertical" android:layout_marginEnd="6dp" - android:paddingTop="12dp" - android:paddingBottom="12dp" + android:paddingTop="13dp" + android:paddingBottom="13dp" android:contentDescription="@string/apps_view_search_bar_hint" android:src="@drawable/ic_search_grey" /> </FrameLayout> - <com.android.launcher3.AppsContainerRecyclerView - android:id="@+id/apps_list_view" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_gravity="center" - android:paddingTop="12dp" - android:paddingBottom="12dp" - android:clipToPadding="false" - android:focusable="true" - android:descendantFocusability="afterDescendants" /> -</LinearLayout>
\ No newline at end of file +</FrameLayout>
\ No newline at end of file |