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

Commit e39fbd87 authored by Jakub Adamek's avatar Jakub Adamek
Browse files

Adding customizable background color support for watch.

values-watch/themes.xml changes some Material themes, e.g.
Dialog inherits from Dark rather than Light. Hence I have moved
all of the theme modifications into
values-watch/themes_device_defaults.xml as they wouldn't be the same
for phones.

Tested: Manually on watch and on angler. Ran CTS host side theme
tests on cw-f-dev, all passed.

cts-tf > run cts -m CtsThemeHostTestCases

Bug: 31459804
Change-Id: I74a8502469cc76ac27a471c0bf18b22fd57f5418
parent d469c4e8
Loading
Loading
Loading
Loading
+21 −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:state_accelerated="false" android:color="?attr/colorBackground" />
    <item android:color="@android:color/transparent" />
</selector>
+21 −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.
-->

<!-- Colors specific to DeviceDefault themes. These are mostly pass-throughs to enable
     overlaying new theme colors. -->
<resources>
    <color name="button_normal_device_default_dark">@color/btn_default_material_dark</color>
</resources>
+3 −1
Original line number Diff line number Diff line
@@ -17,8 +17,10 @@
    <color name="background_material_dark">#ff232e33</color>
    <color name="background_floating_material_dark">#ff3e5059</color>

    <color name="accent_material_dark">#ff5e97f6</color>
    <color name="accent_material_700">#ff2e4978</color>
    <color name="accent_material_light">#ff4285f4</color>
    <color name="accent_material_dark">#ff5e97f6</color>
    <color name="accent_material_50">#ffd0def7</color>

    <color name="primary_material_dark">#4D4D4D</color>

+311 −9

File changed.

Preview size limit exceeded, changes collapsed.

+3 −1

File changed.

Preview size limit exceeded, changes collapsed.