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

Commit 6b77172d authored by Bill Lin's avatar Bill Lin
Browse files

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

1) Define Light Theme and ToolBarTheme to match M2 design
2) Adjust GridItem / ListItem background in Dark Theme
3) Tuning StatusBar and NavigationBar color fulfill design
4) Refactor legacy style definition for GridItem

Test: atest com.android.documentsui.dirlist.ThemeUiTest
      atest com.android.documentsui.dirlist.DarkThemeUiTest
      manually swich to night mode

Bug: 111862978
Bug: 114369969
Bug: 114805149
Change-Id: I3029a4f25640f83cfd5986f965923656fd01958d
parent 254d146d

res/color/item_title.xml→res/color/item_doc_grid_tint_dark.xml

+4 −4
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@ 


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

    <item

        android:state_enabled="true"

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

        android:state_activated="true"

        android:color="@color/item_grid_tint_dark"

        android:alpha=".15" />

    <item

        android:state_enabled="false"

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

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

</selector>

res/drawable/grid_item_background_dark.xml

0 → 100644
+24 −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:drawable="@color/item_doc_background_selected_dark"

          android:state_selected="true" />

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

          android:state_drag_hovered="true" />

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

          android:state_selected="false" />

</selector>
 
 No newline at end of file

res/layout/drag_shadow_layout.xml

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
            android:maxLines="1"

            android:ellipsize="end"

            android:textAlignment="viewStart"

            android:textColor="@color/item_title"

            android:textAppearance="@android:style/TextAppearance.Material.Subhead"

            android:paddingStart="6dp"

            android:paddingBottom="1dp"/>

res/layout/inspector_header.xml

+2 −3
Original line number Diff line number Diff line
@@ -29,16 +29,15 @@ 
        android:id="@+id/inspector_file_title"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:textSize="20sp"

        android:paddingTop="5dp"

        android:paddingBottom="5dp"

        android:paddingStart="16dp"

        android:paddingEnd="16dp"

        android:textColor="@android:color/white"

        android:layout_gravity="center_vertical"

        android:background="@color/inspector_title_background"

        android:textIsSelectable="true"

        android:textAlignment="viewStart"

        android:layout_alignBottom="@+id/inspector_thumbnail" />

        android:layout_alignBottom="@+id/inspector_thumbnail"

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



</RelativeLayout>

res/layout/item_dir_grid.xml

+4 −7
Original line number Diff line number Diff line
@@ -23,20 +23,17 @@ 
     decide to rip these out, please be sure to check out focus and keyboards. -->

<LinearLayout

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

    xmlns:app="http://schemas.android.com/apk/res-auto"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="vertical"

    android:layout_margin="4dp"

    android:focusable="true">



    <com.google.android.material.card.MaterialCardView

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:duplicateParentState="true"

        android:background="@drawable/grid_item_background"

        app:cardUseCompatPadding="true"

        app:cardCornerRadius="@dimen/grid_item_radius"

        app:cardElevation="@dimen/grid_item_elevation">

        android:layout_margin="2dp"

        android:duplicateParentState="true">



        <!-- The height is 48px.

             paddingTop (9dp) + @dimen/check_icon_size (30dp) + paddingBottom (9dp) -->
@@ -44,6 +41,7 @@ 
            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:orientation="horizontal"

            android:background="?attr/colorBackgroundFloating"

            android:gravity="center_vertical">



            <FrameLayout
@@ -84,7 +82,6 @@ 
                android:singleLine="true"

                android:textAlignment="viewStart"

                android:textAppearance="@android:style/TextAppearance.Material.Subhead"

                android:textColor="@color/item_title"

                android:layout_marginBottom="9dp"

                android:layout_marginEnd="12dp"

                android:layout_marginTop="9dp"/>