Add search bar to SearchActivity.
Styling doesn't look exactly right yet but there's a bar. Creates an ItemDecoration to add a spacer above the first view. Removes the action bar and replaces it with a SearchView inside of a CardView. Remaining work: pixel pushing Bug: 37477506 Test: make RunSettingsRoboTests Change-Id: Ibf38c3c2725551bc4cd90e98d0020ec49c2eab2b Merged-In: I4a0f0c91c51ff5820b61a596520d80a3337c3466
This commit is contained in:
@@ -18,7 +18,6 @@
|
||||
-->
|
||||
|
||||
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:id="@+id/main_content"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_width="match_parent"
|
||||
android:background="@color/material_grey_300"/>
|
||||
android:id="@+id/main_content"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_width="match_parent"/>
|
||||
|
@@ -15,71 +15,80 @@
|
||||
-->
|
||||
<RelativeLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:id="@+id/search_panel"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="@drawable/search_panel_list_background">
|
||||
|
||||
<LinearLayout android:id="@+id/layout_recent_searches"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:orientation="vertical"
|
||||
android:layout_alignParentTop="true">
|
||||
<FrameLayout
|
||||
android:id="@+id/layout_results"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_above="@id/feedback_popup"
|
||||
android:orientation="vertical">
|
||||
|
||||
<!-- Padding is included in the background -->
|
||||
<android.support.v7.widget.RecyclerView android:id="@+id/list_recent_searches"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:paddingStart="@dimen/dashboard_padding_start"
|
||||
android:paddingEnd="@dimen/dashboard_padding_end"
|
||||
android:paddingTop="@dimen/dashboard_padding_top"
|
||||
android:paddingBottom="@dimen/dashboard_padding_bottom"
|
||||
android:scrollbarStyle="outsideOverlay"
|
||||
android:headerDividersEnabled="false"
|
||||
android:elevation="@dimen/search_panel_elevation"/>
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout android:id="@+id/layout_results"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="fill_parent"
|
||||
android:layout_above="@id/feedback_popup"
|
||||
android:orientation="vertical">
|
||||
|
||||
<!-- Padding is included in the background -->
|
||||
<android.support.v7.widget.RecyclerView android:id="@+id/list_results"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingStart="@dimen/dashboard_padding_start"
|
||||
android:paddingEnd="@dimen/dashboard_padding_end"
|
||||
android:paddingTop="@dimen/dashboard_padding_top"
|
||||
android:paddingBottom="@dimen/dashboard_padding_bottom"
|
||||
android:scrollbarStyle="outsideOverlay"
|
||||
android:scrollbars="vertical"/>
|
||||
<android.support.v7.widget.RecyclerView
|
||||
android:id="@+id/list_results"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingStart="@dimen/dashboard_padding_start"
|
||||
android:paddingEnd="@dimen/dashboard_padding_end"
|
||||
android:paddingTop="@dimen/dashboard_padding_top"
|
||||
android:paddingBottom="@dimen/dashboard_padding_bottom"
|
||||
android:scrollbarStyle="outsideOverlay"
|
||||
android:scrollbars="vertical"/>
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/no_results_layout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:paddingTop="80dp"
|
||||
android:paddingTop="96dp"
|
||||
android:orientation="vertical"
|
||||
android:visibility="gone">
|
||||
|
||||
<Space
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="?android:attr/actionBarSize"/>
|
||||
|
||||
<ImageView
|
||||
android:layout_height="160dp"
|
||||
android:layout_width="160dp"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:src="@drawable/empty_search_results"/>
|
||||
android:layout_height="160dp"
|
||||
android:layout_width="160dp"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:src="@drawable/empty_search_results"/>
|
||||
|
||||
<TextView
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="match_parent"
|
||||
android:paddingTop="24dp"
|
||||
android:textSize="18sp"
|
||||
android:text="@string/search_settings_no_results"
|
||||
android:gravity="center"/>
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="match_parent"
|
||||
android:paddingTop="24dp"
|
||||
android:textSize="18sp"
|
||||
android:text="@string/search_settings_no_results"
|
||||
android:gravity="center"/>
|
||||
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
|
||||
<android.support.v7.widget.CardView
|
||||
android:id="@+id/search_bar"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="@dimen/search_bar_margin"
|
||||
app:cardCornerRadius="2dp"
|
||||
app:cardBackgroundColor="?android:attr/colorBackground"
|
||||
app:cardElevation="2dp">
|
||||
|
||||
<SearchView
|
||||
android:id="@+id/search_view"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:iconifiedByDefault="false"
|
||||
android:imeOptions="actionSearch|flagNoExtractUi"
|
||||
android:theme="?android:attr/actionBarTheme"/>
|
||||
|
||||
</android.support.v7.widget.CardView>
|
||||
|
||||
</FrameLayout>
|
||||
|
||||
<include layout="@layout/search_feedback"/>
|
||||
|
||||
</RelativeLayout>
|
||||
|
Reference in New Issue
Block a user