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

Commit f87e87c4 authored by Andrew Zeng's avatar Andrew Zeng
Browse files

Swap usages of colorPrimaryDark on wear to colorSurface 

This is done since:
  * colorPrimaryDark and colorPrimary are the same Theme.DeviceDefault
    on phone, so this aligns us with that
  * colorPrimaryDark is normally with status bar/action bar, which are
    not relevant on Wear
  * colorSurface/colorSurfaceVariant more appropriate for the particular
    framework components on Wear that were previously using
    colorPrimaryDark

Bug: 268542165
Test: manually verify watch UI using colorPrimaryDark
Change-Id: I37709a0725a683ffbc068a96a99751f3f7fa5114
parent 7a3e378f

core/res/res/color-watch/btn_watch_default_dark.xml

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

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

    <item android:state_enabled="false"

    <item android:state_enabled="false"

          android:alpha="?attr/disabledAlpha"

          android:alpha="?attr/disabledAlpha"

          android:color="?attr/colorPrimaryDark"/>

          android:color="?attr/colorSurface"/>

    <item android:color="?attr/colorPrimaryDark"/>

    <item android:color="?attr/colorSurface"/>

</selector>
 
</selector>

core/res/res/color-watch/switch_track_watch_default_dark.xml

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

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

    <item android:state_enabled="false"

    <item android:state_enabled="false"

          android:alpha="?attr/disabledAlpha"

          android:alpha="?attr/disabledAlpha"

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

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

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

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

</selector>
 
</selector>

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -72,11 +72,11 @@ 
         ! replaced with custom color #333333

         ! replaced with custom color #333333

           (derived from background color + foreground @ 20% opacity)

           (derived from background color + foreground @ 20% opacity)

    -->

    -->

    <color name="primary_dark_device_default_dark">#333333</color>

    <color name="surface_dark">#333333</color>





    <!--

    <!--

       button_normal_device_default_dark

       button_normal_device_default_dark

         - uses ?attr/disabledAlpha and ?attr/colorPrimaryDark to draw state list

         - uses ?attr/disabledAlpha and ?attr/colorSurface to draw state list

           (used as colorButtonNormal attribute in theme)

           (used as colorButtonNormal attribute in theme)

         - see color-watch/btn_watch_default_dark.xml

         - see color-watch/btn_watch_default_dark.xml

    -->

    -->