Merge \"Support tab UI polish.\" into nyc-mr1-dev

am: cac9227e16

Change-Id: I64062459148a6fd38f223eef92cc1680e38423c9
This commit is contained in:
Fan Zhang
2016-06-14 19:31:15 +00:00
committed by android-build-merger
14 changed files with 24 additions and 62 deletions

View File

@@ -21,8 +21,7 @@
android:orientation="vertical"
android:paddingBottom="8dip"
android:background="@color/card_background"
android:importantForAccessibility="noHideDescendants"
android:elevation="@dimen/dashboard_category_elevation" >
android:importantForAccessibility="noHideDescendants">
<TextView android:id="@android:id/title"
android:layout_width="match_parent"

View File

@@ -17,5 +17,5 @@
<View
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="6dp"
android:layout_height="8dp"
android:background="@color/card_background_grey"/>

View File

@@ -23,8 +23,7 @@
android:minHeight="@dimen/dashboard_tile_minimum_height"
android:clickable="true"
android:focusable="true"
android:background="@drawable/selectable_card"
android:elevation="@dimen/dashboard_category_elevation" >
android:background="@drawable/selectable_card">
<ImageView
android:id="@android:id/icon"

View File

@@ -19,4 +19,4 @@
android:id="@+id/sliding_tab_selected_indicator"
android:layout_width="wrap_content"
android:layout_height="@dimen/pager_tabs_selected_indicator_height"
android:background="?android:attr/colorAccent"/>
android:background="@color/accent_color_lighter"/>

View File

@@ -22,6 +22,7 @@
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:ellipsize="end"
android:fontFamily="sans-serif-medium"
android:gravity="center"
android:maxLines="1"
android:padding="@dimen/pager_tabs_title_padding"

View File

@@ -22,7 +22,8 @@
android:clickable="true"
android:focusable="true"
android:background="@drawable/selectable_card_grey"
android:gravity="center_vertical" >
android:gravity="center_vertical"
android:paddingTop="4dp">
<ImageView
android:id="@android:id/icon"
android:layout_width="@dimen/dashboard_tile_image_size"
@@ -35,7 +36,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.TileTitle"
android:textAppearance="@style/TextAppearance.SuggestionTitle"
android:textColor="?android:attr/colorAccent"
android:ellipsize="marquee"
android:fadingEdge="horizontal"/>
@@ -45,7 +46,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="end"
android:paddingEnd="16dp"
android:textAppearance="@style/TextAppearance.TileTitle"
android:paddingEnd="20dp"
android:textAppearance="@style/TextAppearance.SuggestionTitle"
android:textColor="?android:attr/colorAccent"/>
</LinearLayout>

View File

@@ -55,21 +55,11 @@
</RelativeLayout>
<FrameLayout
<ImageView
android:id="@+id/overflow"
style="?android:attr/actionOverflowButtonStyle"
android:layout_width="wrap_content"
android:layout_height="match_parent">
<ImageView
android:id="@+id/overflow"
style="?android:attr/actionOverflowButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="16dp"
android:paddingTop="16dp"
android:paddingEnd="18dp"
android:paddingBottom="16dp"
android:gravity="top"/>
</FrameLayout>
android:layout_height="wrap_content"
android:padding="16dp"/>
</LinearLayout>

View File

@@ -1,27 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2016 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.
-->
<TextView
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@android:id/text1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="16dp"
android:paddingEnd="8dp"
android:paddingStart="8dp"
android:paddingTop="8dp"
android:textAppearance="@style/TextAppearance.CategoryTitle"/>