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

Commit df280a64 authored by Michael Kwan's avatar Michael Kwan Committed by android-build-merger
Browse files

Add colours for disabled state for switch in SwitchPreference for watch devices. am: e797692e

am: 927be2b5

Change-Id: Ide40c3e9acc74ad57de4a6738aec9d2c611f0a8e
parents 6fc4c1ba 927be2b5
Loading
Loading
Loading
Loading
+5 −5
Original line number Diff line number Diff line
@@ -10,9 +10,9 @@
     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:color="?android:colorButtonNormal" android:state_enabled="false" />
    <item android:color="?android:colorControlActivated" android:state_checked="true" />
    <item android:color="?android:colorButtonNormal" />
    <item android:color="?attr/colorButtonNormal" android:alpha="?attr/disabledAlpha"
            android:state_enabled="false" />
    <item android:color="?attr/colorControlActivated" android:state_checked="true" />
    <item android:color="?attr/colorButtonNormal" />
</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.
-->
<!-- Used for the background of switch track for watch switch preference. -->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
    <item android:state_enabled="false"
          android:alpha="0.4" android:color="?attr/colorPrimary" />
    <item android:color="?attr/colorPrimary" />
</selector>
+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@
    android:thumb="@drawable/watch_switch_thumb_material_anim"
    android:thumbTint="@color/watch_switch_thumb_color_material"
    android:track="@drawable/watch_switch_track_material"
    android:trackTint="?android:colorPrimary"
    android:trackTint="@color/watch_switch_track_color_material"
    android:focusable="false"
    android:clickable="false"
    android:background="@null" />