Use vector drawables for dismiss and snooze icons on firing screen
Change-Id: Ia0997760de7bad10226d2fc464e2c8b5da435266
diff --git a/res/drawable-hdpi/ic_alarm_off_white_80dp.png b/res/drawable-hdpi/ic_alarm_off_white_80dp.png
deleted file mode 100644
index 287d834..0000000
--- a/res/drawable-hdpi/ic_alarm_off_white_80dp.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_snooze_white_80dp.png b/res/drawable-hdpi/ic_snooze_white_80dp.png
deleted file mode 100644
index e761103..0000000
--- a/res/drawable-hdpi/ic_snooze_white_80dp.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_alarm_off_white_80dp.png b/res/drawable-mdpi/ic_alarm_off_white_80dp.png
deleted file mode 100644
index fa08809..0000000
--- a/res/drawable-mdpi/ic_alarm_off_white_80dp.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_snooze_white_80dp.png b/res/drawable-mdpi/ic_snooze_white_80dp.png
deleted file mode 100644
index 42f9c6a..0000000
--- a/res/drawable-mdpi/ic_snooze_white_80dp.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_alarm_off_white_80dp.png b/res/drawable-xhdpi/ic_alarm_off_white_80dp.png
deleted file mode 100644
index 8d0dbef..0000000
--- a/res/drawable-xhdpi/ic_alarm_off_white_80dp.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_snooze_white_80dp.png b/res/drawable-xhdpi/ic_snooze_white_80dp.png
deleted file mode 100644
index 4d26f63..0000000
--- a/res/drawable-xhdpi/ic_snooze_white_80dp.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_alarm_off_white_80dp.png b/res/drawable-xxhdpi/ic_alarm_off_white_80dp.png
deleted file mode 100644
index 2183270..0000000
--- a/res/drawable-xxhdpi/ic_alarm_off_white_80dp.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_snooze_white_80dp.png b/res/drawable-xxhdpi/ic_snooze_white_80dp.png
deleted file mode 100644
index 1ddd5ed..0000000
--- a/res/drawable-xxhdpi/ic_snooze_white_80dp.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/ic_dismiss.xml b/res/drawable/ic_dismiss.xml
new file mode 100644
index 0000000..ba91772
--- /dev/null
+++ b/res/drawable/ic_dismiss.xml
@@ -0,0 +1,25 @@
+<?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="80dp"
+ android:height="80dp"
+ android:viewportWidth="80.0"
+ android:viewportHeight="80.0">
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M40,28.3c7.3,0 13.2,5.9 13.2,13.2c0,1.6 -0.3,3.1 -0.8,4.5l2.9,2.9c1.1,-2.2 1.7,-4.7 1.7,-7.4c0,-9.3 -7.6,-16.9 -16.9,-16.9c-2.7,0 -5.1,0.6 -7.4,1.7l2.9,2.9C36.9,28.6 38.4,28.3 40,28.3zM58.8,27.8l-8.7,-7.3l-2.4,2.9l8.7,7.3L58.8,27.8zM22.9,21.3l-2.4,2.4l2.5,2.5l-2.1,1.7l2.7,2.7l2.1,-1.8l1.5,1.5c-2.6,3 -4.1,6.8 -4.1,11.1c0,9.3 7.6,16.9 16.9,16.9c4.2,0 8.1,-1.6 11.1,-4.1l4.1,4.1l2.4,-2.4L24.7,23.2L22.9,21.3zM48.4,51.6c-2.3,1.9 -5.2,3 -8.4,3c-7.3,0 -13.2,-5.9 -13.2,-13.2c0,-3.2 1.1,-6.1 3,-8.4C29.9,33.1 48.4,51.6 48.4,51.6zM32.5,23.2l-2.7,-2.7l-1.6,1.3l2.7,2.7C30.9,24.5 32.5,23.2 32.5,23.2z"/>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_fab_alarm.xml b/res/drawable/ic_fab_alarm.xml
index db7cec6..b61cf75 100644
--- a/res/drawable/ic_fab_alarm.xml
+++ b/res/drawable/ic_fab_alarm.xml
@@ -15,17 +15,14 @@
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="@dimen/fab_alarm_size"
- android:height="@dimen/fab_alarm_size"
- android:viewportHeight="224.0"
- android:viewportWidth="224.0">
+ android:width="@dimen/fab_alarm_size"
+ android:height="@dimen/fab_alarm_size"
+ android:viewportHeight="56.0"
+ android:viewportWidth="56.0">
<path
android:fillColor="#FFFFFFFF"
- android:pathData="M-224.3,48h128v128h-128V48z" />
+ android:pathData="M28,20c-5.2,0 -9.3,4.2 -9.3,9.3c0,5.2 4.2,9.3 9.3,9.3c5.2,0 9.3,-4.2 9.3,-9.3C37.3,24.2 33.2,20 28,20zM33,34.5l-6.3,-3.8v-8h2v7l5.3,3.2L33,34.5z" />
<path
android:fillColor="#FFFFFFFF"
- android:pathData="M112,80.4c-20.6,0 -37.3,16.7 -37.3,37.3c0,20.6 16.7,37.3 37.3,37.3s37.3,-16.7 37.3,-37.3C149.3,97.1 132.6,80.4 112,80.4zM132,138.2L106.7,123V91h8v28l21.3,12.6L132,138.2z" />
- <path
- android:fillColor="#FFFFFFFF"
- android:pathData="M112,0C50.1,0 0,50.1 0,112s50.1,112 112,112s112,-50.1 112,-112S173.9,0 112,0zM83.2,58.3l6.8,8.2L65.5,87l-6.9,-8.2L83.2,58.3zM112,165.7c-26.6,0 -48,-21.5 -48,-48s21.5,-48 48,-48s48,21.5 48,48S138.5,165.7 112,165.7zM158.5,87l-24.5,-20.6l6.9,-8.2l24.5,20.6L158.5,87z" />
+ android:pathData="M28,0C12.5,0 0,12.5 0,28c0,15.5 12.5,28 28,28c15.5,0 28,-12.5 28,-28C56,12.5 43.5,0 28,0zM20.8,14.5l1.7,2l-6.1,5.1l-1.7,-2L20.8,14.5zM28,41.3c-6.6,0 -12,-5.4 -12,-12s5.4,-12 12,-12c6.6,0 12,5.4 12,12S34.6,41.3 28,41.3zM39.6,21.7l-6.1,-5.1l1.7,-2l6.1,5.1L39.6,21.7z" />
</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_snooze.xml b/res/drawable/ic_snooze.xml
new file mode 100644
index 0000000..44b4a8e
--- /dev/null
+++ b/res/drawable/ic_snooze.xml
@@ -0,0 +1,31 @@
+<?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="80dp"
+ android:height="80dp"
+ android:viewportWidth="80.0"
+ android:viewportHeight="80.0">
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M19,25.1l11.5,0l0,3.8l-5.7,7.6l5.7,0l0,3.9l-11.5,0l0,-3.9l5.8,-7.6l-5.8,0z"/>
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M34.3,32.7l11.4,0l0,3.8l-5.7,7.7l5.7,0l0,3.8l-11.4,0l0,-3.8l5.7,-7.7l-5.7,0z"/>
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M49.5,40.4l11.5,0l0,3.8l-5.8,7.6l5.8,0l0,3.8l-11.5,0l0,-3.8l5.7,-7.6l-5.7,0z"/>
+</vector>
\ No newline at end of file
diff --git a/res/layout/alarm_activity.xml b/res/layout/alarm_activity.xml
index b2cb714..b2d7e6e 100644
--- a/res/layout/alarm_activity.xml
+++ b/res/layout/alarm_activity.xml
@@ -32,7 +32,7 @@
<TextView
android:id="@+id/title"
- android:layout_width="0dip"
+ android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="?attr/actionBarSize"
android:gravity="center"
@@ -46,7 +46,7 @@
<TextClock
android:id="@+id/digital_clock"
- android:layout_width="0dip"
+ android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="center"
android:includeFontPadding="false"
@@ -60,8 +60,8 @@
<com.android.deskclock.widget.CircleView
android:id="@+id/pulse"
- android:layout_width="0dip"
- android:layout_height="0dip"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
android:gravity="center"
android:layerType="hardware"
app:layout_row="2"
@@ -77,7 +77,7 @@
android:layout_height="wrap_content"
android:background="@drawable/bg_circle_accent"
android:contentDescription="@string/alarm_alert_snooze_text"
- android:src="@drawable/ic_snooze_white_80dp"
+ app:srcCompat="@drawable/ic_snooze"
app:layout_row="2"
app:layout_column="0"
app:layout_columnWeight="1"
@@ -89,7 +89,7 @@
android:layout_height="wrap_content"
android:background="@drawable/bg_circle_white"
android:contentDescription="@string/alarm_alert_dismiss_text"
- android:src="@drawable/ic_alarm_off_white_80dp"
+ app:srcCompat="@drawable/ic_dismiss"
app:layout_row="2"
app:layout_column="2"
app:layout_columnWeight="1"
@@ -154,4 +154,4 @@
</LinearLayout>
-</FrameLayout>
+</FrameLayout>
\ No newline at end of file
