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

Merge "Initial search bar implementation." into oc-dev

Browse Source 
am: 91fe76263f

Change-Id: I7e6921134a239e136aaf6380ab4d7993e943435a
This commit is contained in:
Andrew Sapperstein
2017-06-01 20:01:49 +00:00
committed by android-build-merger
parent ecfbe17684 91fe76263f
commit 9448f68171
11 changed files with 243 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
res/layout/dashboard_header_spacer.xml Normal file
View File

@@ -0,0 +1,25 @@
<?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.
-->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="@dimen/search_bar_margin">
<View
android:layout_width="match_parent"
android:layout_height="?android:attr/actionBarSize"/>
</LinearLayout>

32
res/layout/settings_main_dashboard.xml
View File

@@ -18,7 +18,31 @@
-->
<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"
/>
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_height="match_parent"
android:layout_width="match_parent">
<FrameLayout
android:id="@+id/main_content"
android:layout_height="match_parent"
android:layout_width="match_parent"/>
<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_action_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/search_bar_negative_margin"
android:background="?android:attr/selectableItemBackground"
android:navigationIcon="@drawable/ic_search_24dp"
android:title="@string/search_menu"
android:titleTextAppearance="?android:attr/subtitleTextAppearance"
android:titleTextColor="?android:attr/textColorHint"
android:theme="?android:attr/actionBarTheme"/>
</android.support.v7.widget.CardView>
</FrameLayout>

6
res/values/dimens.xml
View File

@@ -140,6 +140,12 @@
<dimen name="search_suggestion_item_image_margin_start">32dp</dimen>
<dimen name="search_suggestion_item_image_margin_end">32dp</dimen>
<!-- The following two margins need to match, with the caveat that
the second should be negative. The second one ensures that the icons and text
align despite the additional padding caused by the search bar's card background. -->
<dimen name="search_bar_margin">8dp</dimen>
<dimen name="search_bar_negative_margin">-8dp</dimen>
<!-- Dimensions for Wifi Assistant Card -->
<dimen name="wifi_assistant_padding_top_bottom">16dp</dimen>
<dimen name="wifi_assistant_padding_start_end">16dp</dimen>