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

Commit e4a694fa authored by Bill Lin's avatar Bill Lin
Browse files

Support Dark/Light Theme for DocumentsUI (1/N) 

Define Light Theme and ToolBarTheme to match M2 design
Apply M2 Light color for StatusBar / ToolBar
Remove "*android" private reference to achieven unbundle
Refer GM Color Palettes(Neutral)

Bug: 112316733
Test: atest DocusmentsUI
Change-Id: I3b82dbd3e64be5c919615ca1610d275d518f4510
parent ecf3b641

res/color/item_eject_icon.xml

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

    <item android:state_enabled="false"

        android:alpha="@dimen/root_icon_disabled_alpha"

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

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

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

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

</selector>

res/color/item_root_icon.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="false"

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

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

    <item

        android:state_activated="true"

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

res/color/item_root_primary_text.xml

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

  <item android:state_focused="true" android:state_activated="true" android:color="@color/root_activated_color" />

  <item android:state_focused="false" android:state_activated="true" android:color="@color/root_activated_color" />

    <item android:state_enabled="false" android:alpha="0.5" android:color="@color/root_title_color" />

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

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

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

</selector>

res/drawable/ic_arrow_upward.xml

+8 −6
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ 
    android:viewportHeight="24">



    <path

        android:fillColor="#000000"

        android:pathData="M7.41 15.41L12 10.83l4.59 4.58L18 14l-6-6-6 6z"/>

        android:pathData="M0 0h24v24H0V0z" />

    <path

        android:fillColor="?android:textColorSecondary"

        android:pathData="M4 12l1.41 1.41L11 7.83V20h2V7.83l5.58 5.59L20 12l-8-8-8 8z" />

</vector>
 
 No newline at end of file

res/drawable/ic_doc_album.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,6 +19,6 @@ Copyright (C) 2015 The Android Open Source Project 
        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:fillColor="#FF737373"

        android:fillColor="?android:textColorSecondary"

        android:pathData="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10,-4.48 10,-10S17.52 2 12 2zm0 14.5c-2.49 0,-4.5,-2.01,-4.5,-4.5S9.51 7.5 12 7.5s4.5 2.01 4.5 4.5,-2.01 4.5,-4.5 4.5zm0,-5.5c-.55 0,-1 .45,-1 1s.45 1 1 1 1,-.45 1,-1,-.45,-1,-1,-1z"/>

</vector>