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

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

Merge "Fix text contrast of document list item caption." into rvc-dev am: 9af39a03 

Change-Id: Ic43d096dbda94b95c05a55d8068390872763f696
parents 427cb75b 9af39a03

res/color/doc_list_item_subtitle_color.xml

0 → 100644
+22 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2020 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="false"

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

    <item android:color="@color/doc_list_item_subtitle_enabled" />

</selector>

res/layout/item_doc_list.xml

+3 −3
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ 
                    android:ellipsize="end"

                    android:singleLine="true"

                    android:textAlignment="viewStart"

                    android:textAppearance="@android:style/TextAppearance.Material.Caption"/>

                    android:textAppearance="@style/ItemDocListCaptionText"/>



                <TextView

                    android:id="@+id/size"
@@ -128,7 +128,7 @@ 
                    android:ellipsize="end"

                    android:singleLine="true"

                    android:textAlignment="viewStart"

                    android:textAppearance="@android:style/TextAppearance.Material.Caption"/>

                    android:textAppearance="@style/ItemDocListCaptionText"/>



                <TextView

                    android:id="@+id/file_type"
@@ -139,7 +139,7 @@ 
                    android:ellipsize="end"

                    android:singleLine="true"

                    android:textAlignment="viewStart"

                    android:textAppearance="@android:style/TextAppearance.Material.Caption"/>

                    android:textAppearance="@style/ItemDocListCaptionText"/>

            </LinearLayout>

        </LinearLayout>

res/values-night/colors.xml

+4 −0
Original line number Diff line number Diff line
@@ -29,4 +29,8 @@ 


    <color name="edge_effect">@android:color/white</color>

    <color name="tab_indicator_color">#669DF6</color> <!-- Blue 400 -->



    <!-- AppCompat.textColorSecondary -->

    <color name="doc_list_item_subtitle_enabled">#b3ffffff</color>

    <color name="doc_list_item_subtitle_disabled">#36ffffff</color>

</resources>

res/values/colors.xml

+3 −0
Original line number Diff line number Diff line
@@ -49,4 +49,7 @@ 


    <color name="tab_indicator_color">#1A73E8</color> <!-- Blue 600 -->

    <color name="edge_effect">@android:color/black</color>



    <color name="doc_list_item_subtitle_enabled">#5F6368</color> <!-- Gray 700 -->

    <color name="doc_list_item_subtitle_disabled">#613c4043</color> <!-- 38% Grey800 -->

</resources>

res/values/styles_text.xml

+4 −0
Original line number Diff line number Diff line
@@ -119,4 +119,8 @@ 
        <item name="fontFamily">@string/config_fontFamilyMedium</item>

    </style>



    <style name="ItemDocListCaptionText" parent="@android:style/TextAppearance.Material.Caption">

        <item name="android:textColor">@color/doc_list_item_subtitle_color</item>

    </style>



</resources>
 
 No newline at end of file