Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add colours for disabled state for switch in SwitchPreference for watch devices.

Browse Source 
Bug: 30578046
Change-Id: I692f6375a73c9d334d576d3eca7f9721af120e30
This commit is contained in:
Michael Kwan
2016-08-03 21:54:59 -07:00
parent 54f4570487
commit e797692edb
3 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/res/res/color/watch_switch_thumb_color_material.xml
View File

@@ -10,9 +10,9 @@
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?android:colorButtonNormal" android:state_enabled="false" /> <item android:color="?attr/colorButtonNormal" android:alpha="?attr/disabledAlpha"
<item android:color="?android:colorControlActivated" android:state_checked="true" /> android:state_enabled="false" />
<item android:color="?android:colorButtonNormal" /> <item android:color="?attr/colorControlActivated" android:state_checked="true" />
</selector> <item android:color="?attr/colorButtonNormal" />
</selector>

21
core/res/res/color/watch_switch_track_color_material.xml Normal file
View File

@@ -0,0 +1,21 @@
<?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>

2
core/res/res/layout-watch/preference_widget_switch.xml
View File

@@ -24,7 +24,7 @@
android:thumb="@drawable/watch_switch_thumb_material_anim" android:thumb="@drawable/watch_switch_thumb_material_anim"
android:thumbTint="@color/watch_switch_thumb_color_material" android:thumbTint="@color/watch_switch_thumb_color_material"
android:track="@drawable/watch_switch_track_material" android:track="@drawable/watch_switch_track_material"
android:trackTint="?android:colorPrimary" android:trackTint="@color/watch_switch_track_color_material"
android:focusable="false" android:focusable="false"
android:clickable="false" android:clickable="false"
android:background="@null" /> android:background="@null" />