Merge "UI Tweak: update setting dashboard cards background color." into nyc-mr1-dev

This commit is contained in:
Fan Zhang
2016-06-29 18:18:32 +00:00
committed by Android (Google) Code Review
4 changed files with 5 additions and 26 deletions

View File

@@ -1,21 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2015 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
-->
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?android:attr/colorControlHighlight" >
<item android:drawable="@color/card_background"/>
</ripple>

View File

@@ -19,11 +19,11 @@
android:id="@+id/dashboard_tile"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:gravity="center_vertical"
android:minHeight="@dimen/dashboard_tile_minimum_height"
android:clickable="true"
android:focusable="true"
android:background="@drawable/selectable_card">
android:focusable="true">
<ImageView
android:id="@android:id/icon"

View File

@@ -18,11 +18,11 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:gravity="center_vertical"
android:minHeight="@dimen/dashboard_tile_minimum_height"
android:clickable="true"
android:focusable="true"
android:background="@drawable/selectable_card">
android:focusable="true">
<View
android:layout_width="@dimen/dashboard_tile_image_size"

View File

@@ -71,7 +71,7 @@
<color name="running_processes_system_ram">#ff384248</color>
<color name="running_processes_free_ram">#ffced7db</color>
<color name="card_background">#ffffffff</color>
<color name="card_background">#fffafafa</color>
<color name="wifi_divider">#ffe0e0e0</color>
<color name="sim_noitification">@*android:color/material_deep_teal_500</color>