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

Merge "Add optional feedback button for settings search"

Browse Source
This commit is contained in:
Matthew Fritze
2017-03-13 19:39:49 +00:00
committed by Android (Google) Code Review
parent a6b01f19da 2beb03f4b7
commit 8145b0f35a
11 changed files with 237 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
res/layout/search_feedback.xml Normal file
View File

@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2017 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<View
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/feedback_popup"
android:layout_width="0dp"
android:layout_height="0dp"
android:visibility="gone">
</View>

49
res/layout/search_panel_2.xml
View File

@@ -13,18 +13,19 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/search_panel"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:orientation="vertical">
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
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:orientation="vertical"
android:layout_alignParentTop="true">
<!-- Padding is included in the background -->
<android.support.v7.widget.RecyclerView android:id="@+id/list_recent_searches"
@@ -36,27 +37,47 @@
android:paddingBottom="@dimen/dashboard_padding_bottom"
android:scrollbarStyle="outsideOverlay"
android:headerDividersEnabled="false"
android:background="@drawable/search_panel_list_background"
android:elevation="@dimen/search_panel_elevation"/>
</LinearLayout>
<LinearLayout android:id="@+id/layout_results"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
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="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:background="@drawable/search_panel_list_background"/>
android:scrollbars="vertical"/>
<LinearLayout
android:id="@+id/no_results_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:orientation="vertical"
android:visibility="gone">
<ImageView
android:layout_height="112dp"
android:layout_width="112dp"
android:src="@drawable/no_search_results"/>
<TextView
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:textSize="18sp"
android:text="@string/search_settings_no_results"
android:gravity="center"/>
</LinearLayout>
</LinearLayout>
</LinearLayout>
<include layout="@layout/search_feedback"/>
</RelativeLayout>