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

Commit 9e8dd005 authored by Todd Lee's avatar Todd Lee
Browse files

Device Default theming updates for Wear 

- aligning styled attributes with those defined in O RC
- reduce coupling to/mutation of the material theme
- includes all previously customized values (i.e. WTS neutral)

Test: should be no visible difference (changes are focused
      on simplifying resources and their inheritance via theme
      definitions, as well as explicitly defining additional
      resources not currently used in the application layer).

WTS OemColorsTest should pass:
run wts --module WtsOemConfigDeviceTestCases
(no failure on colors... doesn't mean no failures)

Bug:b/63525308

Change-Id: I5c3c3b848e0090169b884ec005113aeac2560993
parent ceb0963f

core/res/res/values-watch/colors_device_defaults.xml

+79 −0
Original line number Diff line number Diff line
@@ -17,8 +17,87 @@ 
<!-- Colors specific to DeviceDefault themes. These are mostly pass-throughs to enable

     overlaying new theme colors. -->

<resources>



    <!--

       primary_device_default_dark

         > from values/colors_material/primary_material_dark

         > from values/colors_material/material_grey_900

         = #ff212121

         ! replaced with custom color #33ffffff

    -->

    <color name="primary_device_default_dark">#33ffffff</color>

    <!--

       primary_dark_device_default_dark

         > from values/colors_material/primary_dark_material_dark

         = @color/black

    -->

    <color name="primary_dark_device_default_dark">@color/black</color>

    <!--

       accent_device_default_dark

         > from values/colors_material/accent_material_dark

         > from values/colors_material/material_deep_teal_200

         = #ff80cbc4

         ! replaced with custom color #5E97F6

    -->

    <color name="accent_device_default_dark">#5E97F6</color>

    <!--

       background_device_default_dark

         > from values/colors_material/background_material_dark

         > from values/colors_material/material_grey_850

         = #ff303030

         ! replaced with custom color #232E33

    -->

    <color name="background_device_default_dark">#232E33</color>

    <!--

       background_floating_device_default_dark

         > from values/colors_material/background_floating_material_dark

         > from values/colors_material/material_grey_800

         = #ff424242

         ! replaced with custom color #3E5059

    -->

    <color name="background_floating_device_default_dark">#3E5059</color>



    <!--

       background_cache_hint_selector_device_default

         - note that this is based off of colors/background_cache_hint_selector_device_default

           xml drawable

         - uses ?attr/colorBackground and transparency to draw

         - no color customization required here

    -->



    <!--

       button_normal_device_default_dark

         - uses ?attr/disabledAlpha and button_material_dark to draw

         - cloned to watch_btn_default.xml drawable

           (btn_default_material_dark & button_material_dark - see

           values-watch/colors_material.xml)

    -->

    <color name="button_normal_device_default_dark">@color/btn_default_material_dark</color>



    <!-- Use the same value as for accent_device_default_dark but start with #99,

         i.e. 60% opacity -->

    <color name="accent_device_default_dark_60_percent_opacity">#995E97f6</color>



    <!--

       foreground_device_default_dark

         - introduced to avoid coupling to foreground_material_dark

         - colorForeground typically falls through Theme.DeviceDefault to Theme.Material

    -->

    <color name="foreground_device_default_dark">@color/white</color>



    <!--

       error_color_device_default_dark

         - introduced to avoid coupling to error_color_material (also #F4511E)

         - colorError typically falls through Theme.DeviceDefault to Theme.Material

    -->

    <color name="error_color_device_default_dark">#F4511E</color>



    <!-- deprecated for Wear

         these overrides exist only for compatibility with existing

         WTS theme test heuristics, based on the previous modifications

         to the material theme, they should not be used for customization

         as they are not exposed via publicly accessible attributes -->

    <color name="accent_device_default_700">#5385DB</color>

    <color name="accent_device_default_light">#75A4F5</color>

    <color name="accent_device_default_50">#93B7F5</color>

</resources>

core/res/res/values-watch/colors_material.xml

+2 −9
Original line number Diff line number Diff line
@@ -14,15 +14,8 @@ 
     limitations under the License.

-->

<resources>

    <color name="background_material_dark">#232E33</color>

    <color name="background_floating_material_dark">#3E5059</color>



    <color name="accent_material_700">#5385DB</color>

    <color name="accent_material_light">#75A4F5</color>

    <color name="accent_material_dark">#5E97F6</color>

    <color name="accent_material_50">#93B7F5</color>



    <color name="primary_material_dark">#33ffffff</color>



  <!-- referenced in colors/watch_btn_default.xml selector -->

  <color name="button_material_dark">#ff919699</color>



</resources>

core/res/res/values-watch/dimens_device_defaults.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.

-->

<resources>

  <!-- Alpha transparency for wigets that set enablement/disablement programmatically

       transparency is applied in the disabled state -->

    <dimen name="disabled_alpha_device_default">0.5</dimen>

  <!-- Alpha transparency applied to elements which are considered primary (e.g. primary text) -->

    <dimen name="primary_content_alpha_device_default">1.0</dimen>

  <!-- Alpha transparency applied to elements which are considered secondary (e.g. secondary text) -->

    <dimen name="secondary_content_alpha_device_default">0.8</dimen>

</resources>

core/res/res/values-watch/themes_device_defaults.xml

+105 −0

File changed.

Preview size limit exceeded, changes collapsed.