summaryrefslogtreecommitdiff
path: root/data/res/color
diff options
context:
space:
mode:
Diffstat (limited to 'data/res/color')
-rw-r--r--data/res/color/config_progress_background_tint.xml (renamed from data/res/color/control_nodisable_material.xml)2
-rw-r--r--data/res/color/watch_switch_thumb_color_material.xml18
-rw-r--r--data/res/color/watch_switch_track_color_material.xml22
3 files changed, 1 insertions, 41 deletions
diff --git a/data/res/color/control_nodisable_material.xml b/data/res/color/config_progress_background_tint.xml
index 4a73e93a..b086e20b 100644
--- a/data/res/color/control_nodisable_material.xml
+++ b/data/res/color/config_progress_background_tint.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
+<!-- Copyright (C) 2018 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.
diff --git a/data/res/color/watch_switch_thumb_color_material.xml b/data/res/color/watch_switch_thumb_color_material.xml
deleted file mode 100644
index f78d9b62..00000000
--- a/data/res/color/watch_switch_thumb_color_material.xml
+++ /dev/null
@@ -1,18 +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: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>
diff --git a/data/res/color/watch_switch_track_color_material.xml b/data/res/color/watch_switch_track_color_material.xml
deleted file mode 100644
index c7dc5d34..00000000
--- a/data/res/color/watch_switch_track_color_material.xml
+++ /dev/null
@@ -1,22 +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"
- android:alpha="?attr/disabledAlpha"
- android:color="?android:colorPrimary" />
- <item android:color="?android:colorPrimary" />
-</selector> \ No newline at end of file