PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Search results page polish" into oc-dr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-06-27 16:53:52 +00:00
committed by Android (Google) Code Review
parent 63e36128e6 ab0c049bc2
commit 692a4b5514
7 changed files with 75 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
res/layout/search_panel.xml
View File

@@ -13,19 +13,50 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<RelativeLayout
<LinearLayout
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">
android:orientation="vertical">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/material_grey_300">
<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">
<Toolbar
android:id="@+id/search_toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:contentInsetStart="0dp"
android:contentInsetStartWithNavigation="0dp"
android:theme="?android:attr/actionBarTheme">
<SearchView
android:id="@+id/search_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:iconifiedByDefault="false"
android:imeOptions="actionSearch|flagNoExtractUi"
android:searchIcon="@null"/>
</Toolbar>
</android.support.v7.widget.CardView>
</FrameLayout>
<FrameLayout
android:id="@+id/layout_results"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@id/feedback_popup"
android:layout_height="0dp"
android:layout_weight="1"
android:orientation="vertical">
<!-- Padding is included in the background -->
@@ -68,27 +99,8 @@
</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>
</LinearLayout>