Implement default assist app setting

- Add "None" support to AppListPreference
- Add DefaultAssistPreference to manage assist;
- Add AppListPreferenceWithSettings to show a settings icon;
- Implement DefaultAssistPreference based on AppListPreferenceWithSettings;
- Move voice input settings into ManageAssist and implement it
  based on AppListPreferenceWithSettings;

Bug:20210110
Change-Id: If283b8b55a46b428ecfa6e45dc2123292b1d4302

5 files changed, 70 insertions, 10 deletions

diff --git a/res/drawable/ic_remove_circle.xml b/res/drawable/ic_remove_circle.xml
new file mode 100644
index 0000000..439cc78
--- /dev/null
+++ b/res/drawable/ic_remove_circle.xml
@@ -0,0 +1,26 @@
+<?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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="48dp"
+    android:width="48dp"
+    android:tint="#db4437"
+    android:viewportHeight="48"
+    android:viewportWidth="48" >
+    <path android:fillColor="@android:color/white"
+       android:pathData="M24,4C12.95,4,4,12.95,4,24
+                         s8.95,20,20,20,20-8.95,20-20
+                         S35.05,4,24,4zm10,22H14v-4h20v4z"/>
+</vector>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6c19115..3e483e1 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -6557,11 +6557,37 @@
     <!-- Title for Default Apps settings [CHAR LIMIT=30] -->
     <string name="default_apps_title">Default Apps</string>
 
+    <!-- Title for Assist and voice input settings [CHAR LIMIT=30] -->
+    <string name="assist_and_voice_input_title">Assist &amp; voice input</string>
+
     <!-- Title for Default Assist settings [CHAR LIMIT=30] -->
-    <string name="default_assist_title">Assist</string>
+    <string name="default_assist_title">Assist app</string>
 
     <!-- Summary for No Default Assist settings [CHAR LIMIT=45] -->
-    <string name="default_assist_none">No default Assist</string>
+    <string name="default_assist_none">None</string>
+
+    <!-- Title for Choose Assist dialog [CHAR LIMIT=30] -->
+    <string name="choose_assist_title">Choose Assist</string>
+
+    <!-- [CHAR_LIMIT=45] Title of the security warning dialog for setting an assitant -->
+    <string name="assistant_security_warning_title">
+        Make <xliff:g id="assistant_app_name">%s</xliff:g> your assistant?
+    </string>
+
+    <!-- [CHAR_LIMIT=NONE] Warning message about security implications of setting an assistant,
+         displayed as a dialog message when the user selects an assistant. -->
+    <string name="assistant_security_warning"><xliff:g id="assistant_app_name">%s</xliff:g> will
+        be able to read information about apps in use on your system, including information
+        visible on your screen or accessible within the apps.</string>
+
+    <!-- Label for the button to acknowledge assistant security implications. [CHAR LIMIT=30] -->
+    <string name="assistant_security_warning_agree">Agree</string>
+
+    <!-- Label for the button to bail out assistant security implications. [CHAR LIMIT=30] -->
+    <string name="assistant_security_warning_disagree">Disagree</string>
+
+    <!-- Title for Choose voice input dialog [CHAR LIMIT=30] -->
+    <string name="choose_voice_input_title">Choose voice input</string>
 
     <!-- Title for Default Browser settings [CHAR LIMIT=30] -->
     <string name="default_browser_title">Browser app</string>
@@ -6779,4 +6805,7 @@
 
     <!-- Instructions for state when SD card is unmounted [CHAR LIMIT=NONE] -->
     <string name="sdcard_unmounted_description">The SD card is safely ejected, but still available in the SD card slot for this device.\n\nTo use this card, you have to mount it first.</string>
+
+    <!-- Label for None item in AppListPreference [CHAR LIMIT=40] -->
+    <string name="app_list_preference_none">None</string>
 </resources>
diff --git a/res/xml/default_apps.xml b/res/xml/default_apps.xml
index ab65ac8..d5f9de0 100644
--- a/res/xml/default_apps.xml
+++ b/res/xml/default_apps.xml
@@ -20,9 +20,9 @@
         android:key="default_apps">
 
     <Preference
-        android:key="default_assist"
+        android:key="assist_and_voice_input"
         android:fragment="com.android.settings.applications.ManageAssist"
-        android:title="@string/default_assist_title"
+        android:title="@string/assist_and_voice_input_title"
         />
 
     <com.android.settings.applications.DefaultBrowserPreference
diff --git a/res/xml/language_settings.xml b/res/xml/language_settings.xml
index 5cc8a4a..fa96a56 100644
--- a/res/xml/language_settings.xml
+++ b/res/xml/language_settings.xml
@@ -64,12 +64,6 @@
             android:title="@string/voice_category" >
 
         <PreferenceScreen
-                android:key="voice_input_settings"
-                android:title="@string/voice_input_settings_title"
-                android:fragment="com.android.settings.voice.VoiceInputSettings"
-                />
-
-        <PreferenceScreen
                 android:key="tts_settings"
                 android:title="@string/tts_settings_title"
                 android:fragment="com.android.settings.tts.TextToSpeechSettings"
diff --git a/res/xml/manage_assist.xml b/res/xml/manage_assist.xml
index e3ee859..39a7120 100644
--- a/res/xml/manage_assist.xml
+++ b/res/xml/manage_assist.xml
@@ -19,12 +19,23 @@
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:key="manage_assist">
 
+    <com.android.settings.applications.DefaultAssistPreference
+            android:key="default_assist"
+            android:title="@string/default_assist_title"
+            android:summary="@string/default_assist_none"
+            />
+
     <SwitchPreference
         android:key="context"
         android:title="@string/assist_access_context_title"
         android:summary="@string/assist_access_context_summary"
         android:persistent="false"/>
 
+    <com.android.settings.voice.VoiceInputListPreference
+            android:key="voice_input_settings"
+            android:title="@string/voice_input_settings_title"
+            />
+
     <Preference
         android:summary="@string/assist_footer"
         android:selectable="false"/>