40be7df5df
Various tweaks to match redlines: - background is now grey all the time - the search icon is aligned with the other icons - the title text is primary colored instead of accent colored - the background of search bar doesn't scroll anymore Deletes a bunch of logic to add an initial view that would be colored based on the first view. It never quite worked right. Now it's consistent and never moves. Bug: 37477506 Fixes: 62267378 Fixes: 62379978 Fixes: 62361213 Test: robotests Change-Id: Iddfd45a64a0a8d0365397a207889d7225d1ebb70 Merged-In: I82c584e8f8ecc6fc298c5cdbce08516c6a069a39
53 lines
2.2 KiB
XML
53 lines
2.2 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!--
|
|
/*
|
|
** Copyright 2014, 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"
|
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
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_action_bar"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:background="?android:attr/selectableItemBackground"
|
|
android:contentInsetStartWithNavigation="64dp"
|
|
android:navigationIcon="@drawable/ic_search_24dp"
|
|
android:titleTextColor="@*android:color/text_color_primary"
|
|
android:theme="?android:attr/actionBarTheme"/>
|
|
</android.support.v7.widget.CardView>
|
|
</FrameLayout>
|
|
<FrameLayout
|
|
android:id="@+id/main_content"
|
|
android:layout_height="match_parent"
|
|
android:layout_width="match_parent"/>
|
|
</LinearLayout>
|