From 9072dcd82c8c09ec2758726dfa197f02079fd0f7 Mon Sep 17 00:00:00 2001
From: FEI WU <nuswufei@google.com>
Date: Wed, 9 Nov 2016 14:12:29 -0800
Subject: Update colorPrimary in watch

1. Update colorPrimary in watch. This value is only used for icons and
switch background on watch.

2. Replace hard coded color and disable alpha in switch track.

3. Rename watch_switch_track_mtrl_alpha to be  watch_switch_track_mtrl
since it's no longer a alpha mask.

Change-Id: Ia1eaae62a934c89e3ca6cc8736b256c552f0329b
---
 .../color/watch_switch_track_color_material.xml    |  22 +++++++++++++++++++++
 .../res/drawable-hdpi/watch_switch_track_mtrl.png  | Bin 0 -> 910 bytes
 .../watch_switch_track_mtrl_alpha.png              | Bin 910 -> 0 bytes
 .../res/drawable-xhdpi/watch_switch_track_mtrl.png | Bin 0 -> 1248 bytes
 .../watch_switch_track_mtrl_alpha.png              | Bin 1248 -> 0 bytes
 .../drawable-xxhdpi/watch_switch_track_mtrl.png    | Bin 0 -> 1992 bytes
 .../watch_switch_track_mtrl_alpha.png              | Bin 1992 -> 0 bytes
 .../res/drawable/watch_switch_track_material.xml   |  21 --------------------
 .../res/layout-watch/preference_widget_switch.xml  |   3 ++-
 core/res/res/values-watch/colors_material.xml      |   2 +-
 10 files changed, 25 insertions(+), 23 deletions(-)
 create mode 100644 core/res/res/color/watch_switch_track_color_material.xml
 create mode 100644 core/res/res/drawable-hdpi/watch_switch_track_mtrl.png
 delete mode 100644 core/res/res/drawable-hdpi/watch_switch_track_mtrl_alpha.png
 create mode 100644 core/res/res/drawable-xhdpi/watch_switch_track_mtrl.png
 delete mode 100644 core/res/res/drawable-xhdpi/watch_switch_track_mtrl_alpha.png
 create mode 100644 core/res/res/drawable-xxhdpi/watch_switch_track_mtrl.png
 delete mode 100644 core/res/res/drawable-xxhdpi/watch_switch_track_mtrl_alpha.png
 delete mode 100644 core/res/res/drawable/watch_switch_track_material.xml

diff --git a/core/res/res/color/watch_switch_track_color_material.xml b/core/res/res/color/watch_switch_track_color_material.xml
new file mode 100644
index 000000000000..c7dc5d34204a
--- /dev/null
+++ b/core/res/res/color/watch_switch_track_color_material.xml
@@ -0,0 +1,22 @@
+<?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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <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
diff --git a/core/res/res/drawable-hdpi/watch_switch_track_mtrl.png b/core/res/res/drawable-hdpi/watch_switch_track_mtrl.png
new file mode 100644
index 000000000000..ecee3e137ef6
Binary files /dev/null and b/core/res/res/drawable-hdpi/watch_switch_track_mtrl.png differ
diff --git a/core/res/res/drawable-hdpi/watch_switch_track_mtrl_alpha.png b/core/res/res/drawable-hdpi/watch_switch_track_mtrl_alpha.png
deleted file mode 100644
index ecee3e137ef6..000000000000
Binary files a/core/res/res/drawable-hdpi/watch_switch_track_mtrl_alpha.png and /dev/null differ
diff --git a/core/res/res/drawable-xhdpi/watch_switch_track_mtrl.png b/core/res/res/drawable-xhdpi/watch_switch_track_mtrl.png
new file mode 100644
index 000000000000..1aa544227380
Binary files /dev/null and b/core/res/res/drawable-xhdpi/watch_switch_track_mtrl.png differ
diff --git a/core/res/res/drawable-xhdpi/watch_switch_track_mtrl_alpha.png b/core/res/res/drawable-xhdpi/watch_switch_track_mtrl_alpha.png
deleted file mode 100644
index 1aa544227380..000000000000
Binary files a/core/res/res/drawable-xhdpi/watch_switch_track_mtrl_alpha.png and /dev/null differ
diff --git a/core/res/res/drawable-xxhdpi/watch_switch_track_mtrl.png b/core/res/res/drawable-xxhdpi/watch_switch_track_mtrl.png
new file mode 100644
index 000000000000..af2042be7f59
Binary files /dev/null and b/core/res/res/drawable-xxhdpi/watch_switch_track_mtrl.png differ
diff --git a/core/res/res/drawable-xxhdpi/watch_switch_track_mtrl_alpha.png b/core/res/res/drawable-xxhdpi/watch_switch_track_mtrl_alpha.png
deleted file mode 100644
index af2042be7f59..000000000000
Binary files a/core/res/res/drawable-xxhdpi/watch_switch_track_mtrl_alpha.png and /dev/null differ
diff --git a/core/res/res/drawable/watch_switch_track_material.xml b/core/res/res/drawable/watch_switch_track_material.xml
deleted file mode 100644
index 79e92a331071..000000000000
--- a/core/res/res/drawable/watch_switch_track_material.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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.
--->
-
-<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>
diff --git a/core/res/res/layout-watch/preference_widget_switch.xml b/core/res/res/layout-watch/preference_widget_switch.xml
index 5881cf0c4d1e..a1a845abfe3a 100644
--- a/core/res/res/layout-watch/preference_widget_switch.xml
+++ b/core/res/res/layout-watch/preference_widget_switch.xml
@@ -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" />
diff --git a/core/res/res/values-watch/colors_material.xml b/core/res/res/values-watch/colors_material.xml
index 18bfd4db5ae0..92f77622a2a2 100644
--- a/core/res/res/values-watch/colors_material.xml
+++ b/core/res/res/values-watch/colors_material.xml
@@ -22,7 +22,7 @@
     <color name="accent_material_dark">#ff5e97f6</color>
     <color name="accent_material_50">#ffd0def7</color>
 
-    <color name="primary_material_dark">#4D4D4D</color>
+    <color name="primary_material_dark">#33ffffff</color>
 
     <color name="button_material_dark">#ff919699</color>
 </resources>
-- 
cgit v1.2.3-59-g8ed1b