Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e5b195b3 authored by Fan Zhang's avatar Fan Zhang Committed by Android (Google) Code Review
Browse files

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

parents b6367915 8f0a0ac8

res/drawable/selectable_card.xml

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
<?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>

res/layout/dashboard_tile.xml

+2 −2
Original line number Diff line number Diff line
@@ -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"

res/layout/see_all.xml

+2 −2
Original line number Diff line number Diff line
@@ -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"

res/values/colors.xml

+1 −1
Original line number Diff line number Diff line
@@ -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>