From f4addce363bc90ab9770ed8a2575ef8dee6ad9bc Mon Sep 17 00:00:00 2001
From: Phillip Hsu <philliphsu@outlook.com>
Date: Mon, 5 Sep 2016 18:17:32 -0700
Subject: [PATCH] New icon for auto silenced text

---
 .../java/com/philliphsu/clock2/alarms/AlarmActivity.java    | 6 ------
 .../com/philliphsu/clock2/ringtone/RingtoneActivity.java    | 4 +++-
 .../java/com/philliphsu/clock2/timers/TimesUpActivity.java  | 6 ------
 app/src/main/res/drawable/ic_error_outline_96dp.xml         | 4 ++++
 app/src/main/res/layout/activity_ringtone.xml               | 2 --
 5 files changed, 7 insertions(+), 15 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_error_outline_96dp.xml

diff --git a/app/src/main/java/com/philliphsu/clock2/alarms/AlarmActivity.java b/app/src/main/java/com/philliphsu/clock2/alarms/AlarmActivity.java
index d6088cc..bd1b5e6 100644
--- a/app/src/main/java/com/philliphsu/clock2/alarms/AlarmActivity.java
+++ b/app/src/main/java/com/philliphsu/clock2/alarms/AlarmActivity.java
@@ -68,12 +68,6 @@ public class AlarmActivity extends RingtoneActivity<Alarm> {
         getLayoutInflater().inflate(R.layout.content_header_alarm_activity, parent, true);
     }
 
-    @Override
-    protected int getAutoSilencedDrawable() {
-        // TODO: correct icon
-        return R.drawable.ic_half_day_1_24dp;
-    }
-
     @Override
     protected int getAutoSilencedText() {
         return R.string.alarm_auto_silenced_text;
diff --git a/app/src/main/java/com/philliphsu/clock2/ringtone/RingtoneActivity.java b/app/src/main/java/com/philliphsu/clock2/ringtone/RingtoneActivity.java
index 4b286b7..eb681aa 100644
--- a/app/src/main/java/com/philliphsu/clock2/ringtone/RingtoneActivity.java
+++ b/app/src/main/java/com/philliphsu/clock2/ringtone/RingtoneActivity.java
@@ -56,7 +56,9 @@ public abstract class RingtoneActivity<T extends Parcelable> extends AppCompatAc
     protected abstract void getHeaderContent(ViewGroup parent);
 
     @DrawableRes
-    protected abstract int getAutoSilencedDrawable();
+    protected int getAutoSilencedDrawable() {
+        return R.drawable.ic_error_outline_96dp;
+    }
 
     @StringRes
     protected abstract int getAutoSilencedText();
diff --git a/app/src/main/java/com/philliphsu/clock2/timers/TimesUpActivity.java b/app/src/main/java/com/philliphsu/clock2/timers/TimesUpActivity.java
index cd27334..9f1ec1b 100644
--- a/app/src/main/java/com/philliphsu/clock2/timers/TimesUpActivity.java
+++ b/app/src/main/java/com/philliphsu/clock2/timers/TimesUpActivity.java
@@ -61,12 +61,6 @@ public class TimesUpActivity extends RingtoneActivity<Timer> {
         parent.addView(countdown);
     }
 
-    @Override
-    protected int getAutoSilencedDrawable() {
-        // TODO: correct icon
-        return R.drawable.ic_half_day_1_24dp;
-    }
-
     @Override
     protected int getAutoSilencedText() {
         return R.string.timer_auto_silenced_text;
diff --git a/app/src/main/res/drawable/ic_error_outline_96dp.xml b/app/src/main/res/drawable/ic_error_outline_96dp.xml
new file mode 100644
index 0000000..1469c27
--- /dev/null
+++ b/app/src/main/res/drawable/ic_error_outline_96dp.xml
@@ -0,0 +1,4 @@
+<vector android:height="96dp" android:viewportHeight="24.0"
+    android:viewportWidth="24.0" android:width="96dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFFFFF" android:pathData="M11,15h2v2h-2zM11,7h2v6h-2zM11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_ringtone.xml b/app/src/main/res/layout/activity_ringtone.xml
index 8f86ce3..ebc7894 100644
--- a/app/src/main/res/layout/activity_ringtone.xml
+++ b/app/src/main/res/layout/activity_ringtone.xml
@@ -35,9 +35,7 @@
             android:id="@+id/auto_silenced_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:drawableTop="@drawable/ic_half_day_1_24dp"
             android:drawablePadding="8dp"
-            android:text="@string/alarm_auto_silenced_text"
             style="@style/TextAppearance.AppCompat.Large"
             android:theme="@style/AppTheme.TextOverlay"
             android:layout_marginBottom="16dp"/>