am 2809ec9a: am 97149ea8: Enabling VoiceInteractor

* commit '2809ec9aea8f49e1891dca812e7190b5ce8d4c0e':
  Enabling VoiceInteractor

1 files changed, 18 insertions, 22 deletions

diff --git a/res/values/strings.xml b/res/values/strings.xml
index c4d085e22..ffbe82fd2 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -918,14 +918,14 @@
     First %d represents hour, second %d represents minutes,
     [CHAR LIMIT=NONE]
     -->
-    <string name="invalid_time">Invalid time <xliff:g id="invalid_hour" example="25">%d</xliff:g>:<xliff:g id="invalid_minutes" example="63">%d</xliff:g></string>
+    <string name="invalid_time">Invalid time <xliff:g id="invalid_hour" example="25">%d</xliff:g>:<xliff:g id="invalid_minutes" example="63">%d</xliff:g> <xliff:g id="invalid_pmam" example="PM">%s</xliff:g></string>
 
     <!-- String that represents that no alarm has been specified for a requested hour:minutes.
     This happens when a user sends a voice command 'dismiss my alarm at 3:00pm' but they have no
     alarms specified for that time. %s represents the time of the alarm.
     [CHAR LIMIT=NONE]
     -->
-    <string name="no_alarm_at">No alarm at <xliff:g id="alarm_time" example="14:20">%s</xliff:g></string>
+    <string name="no_alarm_at">No alarm at <xliff:g id="alarm_time_hour" example="14">%d</xliff:g>:<xliff:g id="alarm_time_minutes" example="23">%d</xliff:g></string>
 
     <!-- String that represents that the user doesn't have any alarms scheduled. This happens when
     a user sends a voice command 'dismiss next alarm' or 'dismiss all of my alarms' but they have
@@ -952,31 +952,12 @@
     -->
     <string name="stopwatch_mode_changed">Stopwatch mode changed</string>
 
-    <!-- String that represents that the user mentioned a specific alarm in a voice command,
-    e.g. 'dismiss my alarm for 2pm' but for some reason there were two alarm instances scheduled for
-    this alarm id (shouldn't normally happen) so the command wasn't executed.
-    [CHAR LIMIT=NONE]
-    -->
-    <string name="more_than_one_instance_for_this_alarm_id">There is more than one alarm scheduled for this time</string>
-
     <!-- String that represents that the user has sent a voice command 'dismiss my alarm at 3pm' when
     there was no alarm scheduled for that time (they might have had an alarm for 3pm on the list
     but it was disabled).
     [CHAR LIMIT=NONE]
     -->
-    <string name="no_alarm_instances_for_this_id">No alarm scheduled for this time</string>
-
-    <!-- String that represents that the user has canceled an alarm through a voice action.
-    %s represents alarm time, e.g. 14:20
-    [CHAR LIMIT=NONE]
-    -->
-    <string name="alarm_is_canceled"><xliff:g id="alarm_time" example="14:20">%s</xliff:g> alarm canceled</string>
-
-    <!-- String that represents that the user has deleted an alarm through a voice action.
-    %s represents alarm time, e.g. 14:20
-    [CHAR LIMIT=NONE]
-    -->
-    <string name="alarm_is_deleted"><xliff:g id="alarm_time" example="14:20">%s</xliff:g> alarm deleted</string>
+    <string name="no_alarm_scheduled_for_this_time">No alarm scheduled for this time</string>
 
     <!-- String that represents that the user has dismissed an alarm through a voice action.
     %s represents alarm time, e.g. 14:20
@@ -1001,6 +982,14 @@
     -->
     <string name="timer_already_running">Timer already running</string>
 
+    <!-- String that represents that the user has attempted to start or reset a timer when
+     there were more than 1 timer of desired state in which case it's ambiguous
+     which timer the user meant.
+    [CHAR LIMIT=NONE]
+     -->
+    <string name="multiple_timers_available">Unable to complete your request, multiple timers available</string>
+
+
     <!-- String that represents that the user has successfully started a timer through a voice action.
     [CHAR LIMIT=NONE]
     -->
@@ -1070,6 +1059,13 @@
    -->
     <string name="dismiss_alarm">Dismiss alarm</string>
 
+    <!-- String that represents that further action is needed from the user in case their
+    voice command was ambiguous or there are more than 1 alarms that match their request.
+    The user needs to choose an alarm they want to dismiss through the UI
+   [CHAR LIMIT=NONE]
+   -->
+    <string name="pick_alarm_to_dismiss">Pick which alarm to dismiss</string>
+
     <!-- String that represents that the user doesn't have any alarms firing at the moment.
     [CHAR LIMIT=NONE]
     -->