diff options
author | Xiyuan Xia <xiyuan@google.com> | 2015-06-02 14:55:32 -0700 |
---|---|---|
committer | Xiyuan Xia <xiyuan@google.com> | 2015-06-10 08:43:28 -0700 |
commit | 86a554091d0705f2152fcf1d78ca1c7720d9842c (patch) | |
tree | e168fef6ad80da3a545c80101935d68198e438f1 /res/xml | |
parent | 275e6f75208c08eb925048a330ed4aab96e51033 (diff) | |
download | packages_apps_Settings-86a554091d0705f2152fcf1d78ca1c7720d9842c.zip packages_apps_Settings-86a554091d0705f2152fcf1d78ca1c7720d9842c.tar.gz packages_apps_Settings-86a554091d0705f2152fcf1d78ca1c7720d9842c.tar.bz2 |
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
Diffstat (limited to 'res/xml')
-rw-r--r-- | res/xml/default_apps.xml | 4 | ||||
-rw-r--r-- | res/xml/language_settings.xml | 6 | ||||
-rw-r--r-- | res/xml/manage_assist.xml | 11 |
3 files changed, 13 insertions, 8 deletions
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"/> |