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

Commit a9d50e21 authored by Zemiao Zhu's avatar Zemiao Zhu Committed by Automerger Merge Worker
Browse files

Update colors to use dynamic color for Pixel. am: c7e0c485 am: 2b507439 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DocumentsUI/+/14276495

Change-Id: I1ba1f249a59a7a73186c7c75269e9ee789c4b3b2
parents 8220e3e2 2b507439

res/color/horizontal_breadcrumb_color.xml

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

-->



<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:state_enabled="true"

        android:color="?android:colorAccent" />

    <item android:color="?android:attr/colorControlNormal" />

</selector>

res/color/item_doc_grid_border.xml

+2 −2
Original line number Diff line number Diff line
@@ -18,10 +18,10 @@ 
    <item

        android:state_focused="true"

        android:state_selected="false"

        android:color="?android:attr/colorPrimary"/>

        android:color="?android:attr/colorAccent"/>

    <item

        android:state_selected="true"

        android:color="?android:attr/colorPrimary"/>

        android:color="?android:attr/colorAccent"/>

    <item

        android:color="@android:color/transparent"/>

</selector>

res/color/item_doc_grid_tint.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item

        android:state_activated="true"

        android:color="?android:colorPrimary"

        android:color="?android:colorAccent"

        android:alpha=".15" />

    <item

        android:color="@android:color/transparent" />

res/color/item_root_secondary_text.xml

+4 −2
Original line number Diff line number Diff line
@@ -16,8 +16,10 @@ 
  -->



<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:state_focused="true" android:state_activated="true" android:color="?android:colorPrimary" />

    <item android:state_focused="false" android:state_activated="true" android:color="?android:colorPrimary" />

    <item android:state_focused="true" android:state_activated="true"

        android:color="?android:colorControlActivated" />

    <item android:state_focused="false" android:state_activated="true"

        android:color="?android:colorControlActivated" />

    <item android:state_enabled="false" android:alpha="0.5" android:color="?android:textColorSecondary" />

    <item android:color="?android:textColorSecondary" />

</selector>

res/color/search_chip_ripple_color.xml

+5 −5
Original line number Diff line number Diff line
@@ -18,15 +18,15 @@ 
<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <!-- Selected. -->

    <item android:state_pressed="true" android:state_selected="true"

          android:alpha="0.16" android:color="?android:colorPrimary"/>

          android:alpha="0.16" android:color="?android:colorSecondary"/>

    <item android:state_focused="true" android:state_hovered="true" android:state_selected="true"

          android:alpha="0.16" android:color="?android:colorPrimary"/>

          android:alpha="0.16" android:color="?android:colorSecondary"/>

    <item android:state_focused="true" android:state_selected="true"

          android:alpha="0.12" android:color="?android:colorPrimary"/>

          android:alpha="0.12" android:color="?android:colorSecondary"/>

    <item android:state_hovered="true" android:state_selected="true"

          android:alpha="0.04" android:color="?android:colorPrimary"/>

          android:alpha="0.04" android:color="?android:colorSecondary"/>

    <item android:state_selected="true"

          android:alpha="0.00" android:color="?android:colorPrimary"/>

          android:alpha="0.00" android:color="?android:colorSecondary"/>



    <!-- Unselected. -->

    <item android:state_pressed="true" android:alpha="0.16" android:color="?android:textColorSecondary"/>