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

Commit f5a3dfb6 authored by Bill Lin's avatar Bill Lin Committed by Android (Google) Code Review
Browse files

Merge "Remove redundant xxx_dark resource and definition from Docsui"

parents 55ba6da7 11998793

res/color/item_doc_grid_tint_dark.xml

deleted100644 → 0
+0 −24
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_activated="true"

        android:color="@color/item_grid_tint_dark"

        android:alpha=".15" />

    <item

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

</selector>

res/color/search_chip_text_color.xml

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

    <item android:state_selected="true" android:color="?attr/colorAccent"/>

    <item android:state_enabled="true" android:color="?attr/colorOnSurface"/>

    <item android:state_enabled="false" android:color="@color/text_hint_dark"/>

    <item android:state_enabled="false" android:color="@color/text_hint"/>

</selector>
 
 No newline at end of file

res/drawable/grid_item_background_dark.xml→res/drawable-night/grid_item_background.xml

+3 −3
Original line number Diff line number Diff line
@@ -15,10 +15,10 @@ 
-->



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

    <item android:drawable="@color/item_doc_background_selected_dark"

    <item android:drawable="@color/item_doc_background_selected"

          android:state_selected="true" />

    <item android:drawable="@color/item_hover_color_dark"

    <item android:drawable="@color/item_hover_color"

          android:state_drag_hovered="true" />

    <item android:drawable="@color/item_doc_background_dark"

    <item android:drawable="@color/item_doc_background"

          android:state_selected="false" />

</selector>
 
 No newline at end of file

res/drawable/text_cursor.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,5 +16,5 @@ 
<shape xmlns:android="http://schemas.android.com/apk/res/android"

       android:shape="rectangle" >

    <size android:width="1dp" />

    <solid android:color="?attr/textCursorColor"/>

    <solid android:color="@color/text_hint"/>

</shape>
 
 No newline at end of file

res/values-night/colors.xml

+12 −0
Original line number Diff line number Diff line
@@ -14,8 +14,20 @@ 
     limitations under the License.

-->

<resources>

    <color name="accent">#2297f0</color>



    <color name="root_icon_color">#9AA0A6</color>

    <color name="chip_stroke_color">@android:color/transparent</color>

    <color name="chip_selected_background_color">#FF3D4657</color>

    <color name="chip_ripple_color">#FF5195EA</color>



    <color name="item_doc_background">@color/g_grey</color>

    <color name="item_doc_background_disabled">@color/g_light_grey</color>

    <color name="item_doc_background_selected">#4d2297f0</color>

    <color name="item_grid_tint">#ff0e70e8</color>

    <color name="item_hover_color">#ff5f6368</color>



    <color name="text_hint">#fff8f9fa</color>

    <color name="text_handle">#ff3ce4fa</color>

    <color name="text_highlight">#ff3ce4fa</color>

</resources>