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

Commit cbbf416b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update device default colors for darker UI"

parents e9f70acf bef1e2d3

core/res/res/values-watch/colors_material.xml→core/res/res/color-watch/btn_watch_default_dark.xml

+7 −6
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2014 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,9 +13,10 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<resources>



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

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



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

    <item android:state_enabled="false"

          android:alpha="?attr/disabledAlpha"

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

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

</selector>

core/res/res/color/watch_switch_thumb_color_material.xml→core/res/res/color-watch/switch_thumb_watch_default_dark.xml

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

-->

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

    <item android:color="?attr/colorButtonNormal" android:alpha="?attr/disabledAlpha"

    <item android:color="?attr/colorPrimary" android:alpha="?attr/disabledAlpha"

            android:state_enabled="false" />

    <item android:color="?attr/colorControlActivated" android:state_checked="true" />

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

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

</selector>

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

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

    <item android:state_enabled="false"

          android:alpha="?attr/disabledAlpha"

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

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

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

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

</selector>

core/res/res/layout-watch/preference_widget_switch.xml

+3 −3
Original line number Diff line number Diff line
@@ -21,11 +21,11 @@ 
    android:layout_height="40dp"

    android:switchMinWidth="40dp"

    android:layout_gravity="center"

    android:thumb="@drawable/watch_switch_thumb_material_anim"

    android:thumbTint="@color/watch_switch_thumb_color_material"

    android:thumb="@drawable/switch_thumb_watch_default_dark_anim"

    android:thumbTint="@color/switch_thumb_watch_default_dark"

    android:thumbTintMode="multiply"

    android:track="@drawable/watch_switch_track_mtrl"

    android:trackTint="@color/watch_switch_track_color_material"

    android:trackTint="@color/switch_track_watch_default_dark"

    android:focusable="false"

    android:clickable="false"

    android:background="@null" />