Update colorPrimary in watch am: 9072dcd82c am: 78fef4c065

am: 13000bebe1

Change-Id: Icf82000120b76ae525ad1f6af45fa153c4b27964
This commit is contained in:
FEI WU
2016-11-16 21:38:16 +00:00
committed by android-build-merger
6 changed files with 11 additions and 9 deletions

View File

@@ -1,9 +1,12 @@
<?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>
</selector>
<item android:state_enabled="false"
android:alpha="?attr/disabledAlpha"
android:color="?android:colorPrimary" />
<item android:color="?android:colorPrimary" />
</selector>

View File

Before

Width:  |  Height:  |  Size: 910 B

After

Width:  |  Height:  |  Size: 910 B

View File

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

View File

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

View File

@@ -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" />

View File

@@ -22,7 +22,7 @@
<color name="accent_material_dark">#5E97F6</color>
<color name="accent_material_50">#93B7F5</color>
<color name="primary_material_dark">#4D4D4D</color>
<color name="primary_material_dark">#33ffffff</color>
<color name="button_material_dark">#ff919699</color>
</resources>