summaryrefslogtreecommitdiffstats
path: root/res/drawable-watch
diff options
context:
space:
mode:
Diffstat (limited to 'res/drawable-watch')
-rw-r--r--res/drawable-watch/accept_deny_dialog_negative_bg.xml32
-rw-r--r--res/drawable-watch/accept_deny_dialog_positive_bg.xml32
-rw-r--r--res/drawable-watch/action_negative_bg.xml21
-rw-r--r--res/drawable-watch/action_positive_bg.xml21
-rw-r--r--res/drawable-watch/cancel_button.xml4
-rw-r--r--res/drawable-watch/confirm_button.xml4
-rw-r--r--res/drawable-watch/deny_button.xml4
-rw-r--r--res/drawable-watch/ic_cc_checkmark.xml24
-rw-r--r--res/drawable-watch/ic_cc_clear.xml24
-rw-r--r--res/drawable-watch/ic_cc_deny.xml24
10 files changed, 149 insertions, 41 deletions
diff --git a/res/drawable-watch/accept_deny_dialog_negative_bg.xml b/res/drawable-watch/accept_deny_dialog_negative_bg.xml
new file mode 100644
index 00000000..1ccc40ab
--- /dev/null
+++ b/res/drawable-watch/accept_deny_dialog_negative_bg.xml
@@ -0,0 +1,32 @@
+<?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.
+-->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+ <item>
+ <ripple android:color="?android:colorControlHighlight" />
+ </item>
+ <item>
+ <ripple android:color="?android:colorControlHighlight">
+ <item>
+ <shape android:shape="oval"
+ android:tint="?android:colorButtonNormal">
+ <solid android:color="@android:color/white" />
+ <size android:width="@dimen/diag_button_size"
+ android:height="@dimen/diag_button_size" />
+ </shape>
+ </item>
+ </ripple>
+ </item>
+</layer-list>
diff --git a/res/drawable-watch/accept_deny_dialog_positive_bg.xml b/res/drawable-watch/accept_deny_dialog_positive_bg.xml
new file mode 100644
index 00000000..786a35ba
--- /dev/null
+++ b/res/drawable-watch/accept_deny_dialog_positive_bg.xml
@@ -0,0 +1,32 @@
+<?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.
+-->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+ <item>
+ <ripple android:color="?android:colorAccent" />
+ </item>
+ <item>
+ <ripple android:color="?android:colorControlHighlight">
+ <item>
+ <shape android:shape="oval"
+ android:tint="@color/btn_colored_background_material">
+ <solid android:color="@android:color/white" />
+ <size android:width="@dimen/diag_button_size"
+ android:height="@dimen/diag_button_size" />
+ </shape>
+ </item>
+ </ripple>
+ </item>
+</layer-list>
diff --git a/res/drawable-watch/action_negative_bg.xml b/res/drawable-watch/action_negative_bg.xml
index 7b21ba6d..994ae8e2 100644
--- a/res/drawable-watch/action_negative_bg.xml
+++ b/res/drawable-watch/action_negative_bg.xml
@@ -13,23 +13,12 @@
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">
- <shape android:shape="oval">
- <solid android:color="@color/circular_button_disabled"/>
- <size android:width="40dp" android:height="40dp" />
- </shape>
- </item>
- <item android:state_pressed="true">
- <shape android:shape="oval">
- <solid android:color="#757575"/>
- <size android:width="40dp" android:height="40dp" />
- </shape>
- </item>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+ android:color="?android:colorControlHighlight">
<item>
- <shape android:shape="oval">
- <solid android:color="#BDBDBD"/>
+ <shape android:shape="oval" android:tint="?android:colorButtonNormal">
+ <solid android:color="@android:color/white" />
<size android:width="40dp" android:height="40dp" />
</shape>
</item>
-</selector>
+</ripple>
diff --git a/res/drawable-watch/action_positive_bg.xml b/res/drawable-watch/action_positive_bg.xml
index f3457c1a..3e8590f2 100644
--- a/res/drawable-watch/action_positive_bg.xml
+++ b/res/drawable-watch/action_positive_bg.xml
@@ -13,23 +13,12 @@
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">
- <shape android:shape="oval">
- <solid android:color="@color/circular_button_disabled"/>
- <size android:width="40dp" android:height="40dp" />
- </shape>
- </item>
- <item android:state_pressed="true">
- <shape android:shape="oval">
- <solid android:color="#009688"/>
- <size android:width="40dp" android:height="40dp" />
- </shape>
- </item>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+ android:color="?android:colorControlHighlight">
<item>
- <shape android:shape="oval">
- <solid android:color="#00BFA5"/>
+ <shape android:shape="oval" android:tint="@color/btn_colored_background_material">
+ <solid android:color="@android:color/white" />
<size android:width="40dp" android:height="40dp" />
</shape>
</item>
-</selector>
+</ripple>
diff --git a/res/drawable-watch/cancel_button.xml b/res/drawable-watch/cancel_button.xml
index 641526a5..8e4d2d48 100644
--- a/res/drawable-watch/cancel_button.xml
+++ b/res/drawable-watch/cancel_button.xml
@@ -15,7 +15,5 @@
-->
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
<item android:drawable="@drawable/action_negative_bg" />
- <item>
- <bitmap android:src="@drawable/ic_cc_cancel" android:gravity="center" />
- </item>
+ <item android:drawable="@drawable/ic_cc_clear" android:gravity="center" />
</layer-list>
diff --git a/res/drawable-watch/confirm_button.xml b/res/drawable-watch/confirm_button.xml
index 2b53e42e..d1bfae33 100644
--- a/res/drawable-watch/confirm_button.xml
+++ b/res/drawable-watch/confirm_button.xml
@@ -15,7 +15,5 @@
-->
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
<item android:drawable="@drawable/action_positive_bg" />
- <item>
- <bitmap android:src="@drawable/ic_cc_checkmark" android:gravity="center" />
- </item>
+ <item android:drawable="@drawable/ic_cc_checkmark" android:gravity="center" />
</layer-list>
diff --git a/res/drawable-watch/deny_button.xml b/res/drawable-watch/deny_button.xml
index 1e7582bc..0a2e1ae1 100644
--- a/res/drawable-watch/deny_button.xml
+++ b/res/drawable-watch/deny_button.xml
@@ -15,7 +15,5 @@
-->
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
<item android:drawable="@drawable/action_negative_bg" />
- <item>
- <bitmap android:src="@drawable/ic_cc_deny" android:gravity="center" />
- </item>
+ <item android:drawable="@drawable/ic_cc_deny" android:gravity="center" />
</layer-list>
diff --git a/res/drawable-watch/ic_cc_checkmark.xml b/res/drawable-watch/ic_cc_checkmark.xml
new file mode 100644
index 00000000..832e090f
--- /dev/null
+++ b/res/drawable-watch/ic_cc_checkmark.xml
@@ -0,0 +1,24 @@
+<?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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"
+ android:fillColor="#FFFFFF"/>
+</vector>
diff --git a/res/drawable-watch/ic_cc_clear.xml b/res/drawable-watch/ic_cc_clear.xml
new file mode 100644
index 00000000..06bb30b3
--- /dev/null
+++ b/res/drawable-watch/ic_cc_clear.xml
@@ -0,0 +1,24 @@
+<?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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"
+ android:fillColor="#FFFFFF"/>
+</vector>
diff --git a/res/drawable-watch/ic_cc_deny.xml b/res/drawable-watch/ic_cc_deny.xml
new file mode 100644
index 00000000..971dfcc8
--- /dev/null
+++ b/res/drawable-watch/ic_cc_deny.xml
@@ -0,0 +1,24 @@
+<?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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:pathData="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zM4 12c0-4.42 3.58-8 8-8 1.85 0 3.55.63 4.9 1.69L5.69 16.9C4.63 15.55 4 13.85 4 12zm8 8c-1.85 0-3.55-.63-4.9-1.69L18.31 7.1C19.37 8.45 20 10.15 20 12c0 4.42-3.58 8-8 8z"
+ android:fillColor="#FFFFFF"/>
+</vector>