Simplify Zen mode voice activity.

Zen mode voice activity now only sets the notification mode to alarms mode
or off. A duration may be specified if it was in the original intent.

Change-Id: Ica472ca9c6dcbce473832f4f922baf225df4951b
Bug: 21024455

4 files changed, 0 insertions, 182 deletions

diff --git a/res/drawable/bg_voice_position.xml b/res/drawable/bg_voice_position.xml
deleted file mode 100644
index 2fb29c2..0000000
--- a/res/drawable/bg_voice_position.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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.
-  -->
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/voice_interaction_highlight" />
-</shape>
diff --git a/res/layout/voice_interaction.xml b/res/layout/voice_interaction.xml
deleted file mode 100644
index ed0cd1a..0000000
--- a/res/layout/voice_interaction.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:padding="8dp"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textColor="@color/voice_interaction_highlight"
-        android:id="@+id/voice_fragment_header" />
-    <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/voice_fragment_root"
-        android:padding="8dp"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-</LinearLayout>
diff --git a/res/layout/voice_item_row.xml b/res/layout/voice_item_row.xml
deleted file mode 100644
index eca5ac9..0000000
--- a/res/layout/voice_item_row.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?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.
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical" >
-    <LinearLayout
-        android:id="@+id/row_one"
-        android:orientation="horizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentStart="true"
-        android:layout_marginTop="15dp"
-        android:layout_marginBottom="15dp">
-
-        <TextView
-            android:layout_width="0px"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:id="@+id/voice_item_label" />
-
-        <TextView
-            android:layout_width="80px"
-            android:layout_height="80px"
-            android:gravity="center_horizontal|center_vertical"
-            android:background="@drawable/bg_voice_position"
-            android:textAppearance="?android:attr/textAppearanceMediumInverse"
-            android:textStyle="bold"
-            android:id="@+id/voice_item_position" />
-    </LinearLayout>
-</LinearLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7aee58a..7b4d3b4 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -6223,72 +6223,6 @@
     <!-- [CHAR LIMIT=60] Zen mode settings: End time option: Summary text value format when end time = next day -->
     <string name="zen_mode_end_time_next_day_summary_format"><xliff:g id="formatted_time" example="7:00 AM">%s</xliff:g> next day</string>
 
-    <!-- [CHAR LIMIT=NONE] Zen mode voice: Activity title for interruption level  -->
-    <string name="zen_mode_interruptions_voice_title">Interruptions</string>
-
-    <!-- [CHAR LIMIT=NONE] Zen mode voice: Header for interruption level  -->
-    <string name="zen_mode_interruptions_voice_header">When calls and notifications arrive</string>
-
-    <!-- [CHAR LIMIT=NONE] Zen mode voice: Prompt read for interruption type -->
-    <string name="zen_mode_interruptions_voice_prompt">When would you like to be interrupted?</string>
-
-    <!-- [CHAR LIMIT=NONE] Zen mode voice: Prompt read for zen mode duration -->
-    <string name="zen_mode_duration_voice_prompt">For how long?</string>
-
-    <!-- [CHAR LIMIT=80] Zen mode voice: All interruptions -->
-    <string name="zen_mode_option_voice_all_interruptions">Always interrupt</string>
-
-    <!-- [CHAR LIMIT=NONE] Zen mode voice: Comma delimited synonyms for all interriuptions -->
-    <string name="zen_mode_option_voice_all_interruptions_synonyms">off,all,everything</string>
-
-    <!-- [CHAR LIMIT=80] Zen mode voice: Important interruptions -->
-    <string name="zen_mode_option_voice_important_interruptions">Allow only priority interruptions</string>
-
-    <!-- [CHAR LIMIT=NONE] Zen mode voice: Comma delimited synonyms for important interriuptions -->
-    <string name="zen_mode_option_voice_important_synonyms">important,priority,priority only,only priority,priority notifications</string>
-
-    <!-- [CHAR LIMIT=80] Zen mode voice option: Alarms only -->
-    <string name="zen_mode_option_voice_alarms">Allow only alarms</string>
-
-    <!-- [CHAR LIMIT=NONE] Zen mode voice: Comma delimited synonyms for alarm interriuptions -->
-    <string name="zen_mode_option_voice_alarms_synonyms">alarms,alarms only,only alarms</string>
-
-    <!-- [CHAR LIMIT=80] Zen mode voice: No interruptions -->
-    <string name="zen_mode_option_voice_no_interruptions">Don\u2019t interrupt</string>
-
-    <!-- [CHAR LIMIT=NONE] Zen mode voice: Comma delimited synonyms for no interriuptions -->
-    <string name="zen_mode_option_voice_no_interruptions_synonyms">none,never,nothing,no interruptions</string>
-
-    <!-- [CHAR LIMIT=40] Zen mode voice: Label for indefinite mode duration -->
-    <string name="zen_mode_duration_indefinte_voice_label">Indefinitely</string>
-
-    <!-- [CHAR LIMIT=40] Zen mode voice: Label for duration in minutes -->
-    <plurals name="zen_mode_duration_minutes_voice_label">
-       <item quantity="one"><xliff:g id="count" example="1">%d</xliff:g> minute</item>
-       <item quantity="other"><xliff:g id="count" example="10">%d</xliff:g> minutes</item>
-    </plurals>
-
-    <!-- [CHAR LIMIT=40] Zen mode voice: Label for duration in hours -->
-    <plurals name="zen_mode_duration_hours_voice_label">
-       <item quantity="one"><xliff:g id="count" example="1">%d</xliff:g> hour</item>
-       <item quantity="other"><xliff:g id="count" example="10">%d</xliff:g> hours</item>
-    </plurals>
-
-    <!-- [CHAR LIMIT=NONE] Zen mode voice - spoken summary: important only duration indefinite. -->
-    <string name="zen_mode_summary_priority_indefinitely">Change to priority notifications only indefinitely</string>
-
-    <!-- [CHAR LIMIT=NONE] Zen mode voice- spoken summary: important only duration minutes. -->
-    <plurals name="zen_mode_summary_priority_by_minute">
-        <item quantity="one">Change to priority notifications only for one minute until <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g></item>
-        <item quantity="other">Change to priority notifications only for <xliff:g id="duration" example="2">%1$d</xliff:g> minutes until <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g></item>
-    </plurals>
-
-    <!-- [CHAR LIMIT=NONE] Zen mode voice- spoken summary: important only duration hours. -->
-    <plurals name="zen_mode_summary_priority_by_hour">
-        <item quantity="one">Change to priority notifications only for one hour until <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g></item>
-        <item quantity="other">Change to priority notifications only for <xliff:g id="duration" example="2">%1$d</xliff:g> hours (until <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
-    </plurals>
-
     <!-- [CHAR LIMIT=NONE] Zen mode voice - spoken summary: alarms only duration indefinite. -->
     <string name="zen_mode_summary_alarams_only_indefinite">Change to alarms only indefinitely</string>
 
@@ -6304,27 +6238,9 @@
         <item quantity="other">Change to alarms only for <xliff:g id="duration" example="2">%1$d</xliff:g> hours until <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g></item>
     </plurals>
 
-    <!-- [CHAR LIMIT=NONE] Zen mode voice - spoken summary: no interruptions duration indefinite. -->
-    <string name="zen_mode_summary_no_interruptions_indefinite">Change to don\u2019t interrupt indefinitely</string>
-
-    <!-- [CHAR LIMIT=NONE] Zen mode voice- spoken summary: alarms only duration minutes. -->
-    <plurals name="zen_mode_summary_no_interruptions_by_minute">
-        <item quantity="one">Change to don\u2019t interrupt for one minute until <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g></item>
-        <item quantity="other">Change to don\u2019t interrupt for <xliff:g id="duration" example="2">%1$d</xliff:g> minutes (until <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
-    </plurals>
-
-    <!-- [CHAR LIMIT=NONE] Zen mode voice- spoken summary: alarms only duration hours. -->
-    <plurals name="zen_mode_summary_no_interruptions_by_hour">
-        <item quantity="one">Change to don\u2019t interrupt for one hour until <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g></item>
-        <item quantity="other">Change to don\u2019t interrupt for <xliff:g id="duration" example="2">%1$d</xliff:g> hours until <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g></item>
-    </plurals>
-
     <!-- [CHAR LIMIT=NONE] Zen mode voice - spoken summary: off. -->
     <string name="zen_mode_summary_always">Change to always interrupt</string>
 
-    <!-- [CHAR LIMIT=NONE] Zen mode voice: Comma delimited synonyms for indefinte duration -->
-    <string name="zen_mode_duration_indefinite_voice_synonyms">forever</string>
-
     <!-- [CHAR LIMIT=20] Notifications settings: Apps section header -->
     <string name="notification_settings_apps_title">App notifications</string>