Allow user to interact with running timers from notifications.

Bug: 22376599

Timer in use collapsed notification now offers the following actions:
for single running timer: pause, +1
for single paused timer: resume, reset
for multiple timers (paused and/or running): reset all

Additionally, clicking the notification now scrolls the user to an
active timer in TimerFragment.

Change-Id: I9e2385c7601c80387bebc144f6fc281786e3b3f2

9 files changed, 58 insertions, 8 deletions

diff --git a/res/drawable-hdpi/ic_pause_white_24dp.png b/res/drawable-hdpi/ic_pause_white_24dp.png
new file mode 100644
index 000000000..4d2ea05c4
--- /dev/null
+++ b/res/drawable-hdpi/ic_pause_white_24dp.png
diff --git a/res/drawable-mdpi/ic_pause_white_24dp.png b/res/drawable-mdpi/ic_pause_white_24dp.png
new file mode 100644
index 000000000..2272d478c
--- /dev/null
+++ b/res/drawable-mdpi/ic_pause_white_24dp.png
diff --git a/res/drawable-v21/ic_pause_24dp.xml b/res/drawable-v21/ic_pause_24dp.xml
new file mode 100644
index 000000000..899672f7e
--- /dev/null
+++ b/res/drawable-v21/ic_pause_24dp.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 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.
+-->
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/ic_pause_white_24dp"
+    android:tint="@color/black" />
diff --git a/res/drawable-xhdpi/ic_pause_white_24dp.png b/res/drawable-xhdpi/ic_pause_white_24dp.png
new file mode 100644
index 000000000..f49aed757
--- /dev/null
+++ b/res/drawable-xhdpi/ic_pause_white_24dp.png
diff --git a/res/drawable-xxhdpi/ic_pause_white_24dp.png b/res/drawable-xxhdpi/ic_pause_white_24dp.png
new file mode 100644
index 000000000..7192ad487
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_pause_white_24dp.png
diff --git a/res/drawable-xxxhdpi/ic_pause_white_24dp.png b/res/drawable-xxxhdpi/ic_pause_white_24dp.png
new file mode 100644
index 000000000..660ac6585
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_pause_white_24dp.png
diff --git a/res/drawable/ic_pause_24dp.xml b/res/drawable/ic_pause_24dp.xml
new file mode 100644
index 000000000..fa2e61093
--- /dev/null
+++ b/res/drawable/ic_pause_24dp.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 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.
+-->
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/ic_pause_white_24dp" />
diff --git a/res/values/donottranslate_events.xml b/res/values/donottranslate_events.xml
index 40ba2d40b..b43e7cd7c 100644
--- a/res/values/donottranslate_events.xml
+++ b/res/values/donottranslate_events.xml
@@ -32,6 +32,7 @@
     <string name="action_reset">Reset</string>
     <string name="action_show">Show</string>
     <string name="action_add_minute">Add Minute</string>
+    <string name="action_resume">Resume</string>
     <string name="action_lap">Lap</string>
 
     <!-- Label names for events describe the entity responsible for the event. -->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index a26a24175..d1c28f35c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -414,17 +414,24 @@
     <!-- Label for selected cities in Cities list view -->
     <string name="selected_cities_label">Selected Cities</string>
 
-    <!-- Stop Watch strings -->
-    <!-- Describes the purpose of the button to resume running a stopwatch -->
+    <!-- Stopwatch and Timer shared strings -->
+    <!-- Describes the purpose of the button to resume running a stopwatch or timer. [CHAR LIMIT=15] -->
     <string name="sw_resume_button">Resume</string>
+    <!--
+        Describes the purpose of the button
+            for stopwatch: return stopwatch to zero and remove the lap times.
+            for timer: return timer to originally set duration.
+        [CHAR LIMIT=15]
+    -->
+    <string name="sw_reset_button">Reset</string>
+
+    <!-- Stopwatch strings -->
     <!-- Describes the purpose of the button to begin running a stopwatch -->
     <string name="sw_start_button">Start</string>
     <!-- Describes the purpose of the button to pause a stopwatch. -->
     <string name="sw_stop_button">Stop</string>
     <!-- Describes the purpose of the button to record current the stopwatch value into the4 collection of lap times. -->
     <string name="sw_lap_button">Lap</string>
-    <!-- Describes the purpose of the button to return the stopwatch to zero and remove the lap times. -->
-    <string name="sw_reset_button">Reset</string>
     <!-- Describes the purpose of the button to share the stopwatch value.
          Also used as title for chooser when sharing stopwatch results. -->
     <string name="sw_share_button">Share</string>
@@ -547,6 +554,10 @@
     <string name="timer_notification_label">Timer</string>
     <!-- Toast content shown when user attempts to create a new timer when there are already 4 timers -->
     <string name="timers_max_count_reached">4 timers maximum</string>
+    <!-- Describes the purpose of the notification button to pause the timer. [CHAR LIMIT=15] -->
+    <string name="timer_pause">Pause</string>
+    <!-- Describes the purpose of the notification button to reset all running timers. [CHAR LIMIT=15] -->
+    <string name="timer_reset_all">Reset all timers</string>
 
     <!-- Jocular content that user may append when sharing the lap times -->
     <string-array name="sw_share_strings" translatable="true">
@@ -813,11 +824,14 @@
     <!-- Description for timer ringtone setting. -->
     <string name="timer_ringtone_title">Timer ringtone</string>
 
-    <!-- Notification title when timer is stopped. -->
+    <!-- Description when timer is stopped. -->
     <string name="timer_stopped">Timer stopped</string>
-    <!-- Notification title when multiple timers are stopped. -->
-    <string name="timers_stopped"><xliff:g id="number" example="7">%d</xliff:g> timers stopped</string>
-    <!-- Notification text when multiple timers are stopped. -->
+
+    <!-- Notification title when timer is paused. [CHAR LIMIT=25] -->
+    <string name="timer_paused">Timer paused</string>
+    <!-- Notification title when multiple timers are paused. [CHAR LIMIT = 25] -->
+    <string name="timers_stopped"><xliff:g id="number" example="7">%d</xliff:g> timers paused</string>
+    <!-- Notification text when multiple timers are paused. -->
     <string name="all_timers_stopped_notif">Touch to see your timers</string>
     <!-- Notification title when at least one timer, of those in use, is counting down. -->
     <string name="timers_in_use"><xliff:g id="number" example="7">%d</xliff:g> timers</string>