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

Commit 447fff85 authored by Fei Wu's avatar Fei Wu Committed by Android (Google) Code Review
Browse files

Merge "Update colorPrimary in watch" into cw-f-dev

parents 6cc0b517 9072dcd8
Loading
Loading
Loading
Loading
+8 −7
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.
@@ -12,10 +15,8 @@
-->

<selector xmlns:android="http://schemas.android.com/apk/res/android">
    <item android:state_enabled="false">
        <bitmap android:alpha="0.1" android:src="@drawable/watch_switch_track_mtrl_alpha" />
    </item>
    <item>
        <bitmap android:alpha="0.2" android:src="@drawable/watch_switch_track_mtrl_alpha" />
    </item>
    <item android:state_enabled="false"
          android:alpha="?attr/disabledAlpha"
          android:color="?android:colorPrimary" />
    <item android:color="?android:colorPrimary" />
</selector>
 No newline at end of file
+2 −1
Original line number Diff line number Diff line
@@ -24,7 +24,8 @@
    android:thumb="@drawable/watch_switch_thumb_material_anim"
    android:thumbTint="@color/watch_switch_thumb_color_material"
    android:thumbTintMode="multiply"
    android:track="@drawable/watch_switch_track_material"
    android:track="@drawable/watch_switch_track_mtrl"
    android:trackTint="@color/watch_switch_track_color_material"
    android:focusable="false"
    android:clickable="false"
    android:background="@null" />
Loading