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

Update Switch track in SwitchPreference on watch

Browse Source 
Use white color for switch track, alpha = 0.1 in disable state and alpha
= 0.2 in other states.

Change-Id: I17c570c14ff0d62f2eb18fef3c13df91ac16adc6
This commit is contained in:
FEI WU
2016-09-07 10:49:53 -07:00
parent f6132fc0d4
commit 21f989f831
5 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
core/res/res/drawable-hdpi/watch_switch_track_mtrl.png → core/res/res/drawable-hdpi/watch_switch_track_mtrl_alpha.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 910 B

After

Width:  |  Height:  |  Size: 910 B

0
core/res/res/drawable-xhdpi/watch_switch_track_mtrl.png → core/res/res/drawable-xhdpi/watch_switch_track_mtrl_alpha.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

0
core/res/res/drawable-xxhdpi/watch_switch_track_mtrl.png → core/res/res/drawable-xxhdpi/watch_switch_track_mtrl_alpha.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

14
core/res/res/color/watch_switch_track_color_material.xml → core/res/res/drawable/watch_switch_track_material.xml
View File

@@ -1,21 +1,21 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2016 The Android Open Source Project <!-- Copyright (C) 2016 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
You may obtain a copy of the License at You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0 http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS, distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
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.
--> -->
<!-- Used for the background of switch track for watch switch preference. -->
<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="0.4" android:color="?attr/colorPrimary" /> <bitmap android:alpha="0.1" android:src="@drawable/watch_switch_track_mtrl_alpha" />
<item android:color="?attr/colorPrimary" /> </item>
<item>
<bitmap android:alpha="0.2" android:src="@drawable/watch_switch_track_mtrl_alpha" />
</item>
</selector> </selector>

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

@@ -24,8 +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:thumbTintMode="multiply" android:thumbTintMode="multiply"
android:track="@drawable/watch_switch_track_mtrl" android:track="@drawable/watch_switch_track_material"
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" />