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

Commit 81a9ea7d authored by Bill Lin's avatar Bill Lin
Browse files

Refine DocumentsUI Theme to inherit Theme.DeviceDefault.DocumentsUI

Re-define theme structure to support RRO for OEM to customize
1)Allow OEM customize DocumentsTheme by RRO
2)Move night mode resource to corresponding qualifier

Test: manual to check all UI widget looks same as before
Test: atest DocumentsUITests
Change-Id: I25c7cc011d82bddb44c13234f052993d57bf221c
Fix: 118901364
parent 66bcff6e
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -27,8 +27,8 @@
    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />

    <uses-sdk
        android:targetSdkVersion="29"
        android:minSdkVersion="21"/>
        android:targetSdkVersion="Q"
        android:minSdkVersion="Q"/>

    <application
        android:name=".DocumentsApplication"
@@ -183,7 +183,7 @@
        <activity
            android:name=".selection.demo.SelectionDemoActivity"
            android:label="Selection Demo"
            android:theme="@style/Theme.AppCompat.Light.NoActionBar">
            android:theme="@style/DocumentsTheme">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
            </intent-filter>
+22 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2018 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.
-->
<shape
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:shape="oval">

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

</shape>
 No newline at end of file
+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@
     See the License for the specific language governing permissions and
     limitations under the License.
-->

<inset xmlns:android="http://schemas.android.com/apk/res/android"
       android:inset="8dp">
    <shape
+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@
            android:layout_width="match_parent"
            android:layout_height="match_parent"
            android:orientation="horizontal"
            android:background="?attr/colorBackgroundFloating"
            android:background="?android:attr/colorBackgroundFloating"
            android:gravity="center_vertical">

            <FrameLayout
+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@

            <LinearLayout
                android:id="@+id/nameplate"
                android:background="?attr/colorBackgroundFloating"
                android:background="?android:attr/colorBackgroundFloating"
                android:orientation="horizontal"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
Loading