This CL adds "Work profile" section to Languages and input settings. The new section is visible when and only when work profile is enabled. Hence there should be no user-visible behavior difference when work profile is not enabled. If per-profile IME [1] is also enabled, the following 3 preferences will be shown in the new section. * Virtual keyboard for work * Spell checker for work * Personal dictionary for work [1]: Ied99664d3dc61b97c919b220c601f90b29761b96 a878b9500e6b89dce9738179edc27bcd0d736b7e Fix: 120748696 Test: Manually verified as follows. 1. Build and flash an AOSP build 2. adb root 3. adb shell setprop persist.debug.per_profile_ime 1 4. adb reboot 5. Install Test DPC 6. Enable managed profile with Test DPC 7. tapas SoftKeyboard && make -j 8. adb install -r --user 0 $OUT/system/app/SoftKeyboard/SoftKeyboard.apk 9. tapas SampleSpellCheckerService && make -j 10. adb install -r --user 0 \ $OUT/system/app/SampleSpellCheckerService/SampleSpellCheckerService.apk 11. Open Settings -> System -> Languages & input 12. Virtual Keyboard -> Manage keyboards: Make sure both "Android Keyboard" and "Sample Soft Keyboard" are shown. 13. Spell checker -> Default spell checker Make sure "Android Spell Checker" and "Sample correction" are shown. 14. Advanced -> Virtual Keyboard for Work -> Manage keyboards Make sure that only "Android Keyboard" is shown. 15. Advanced -> Spell checker -> Default spell checker Make sure that only "Android Spell Checker" is shown. Change-Id: Id88928318ab1cd92963d652ae39ca772222ea4ac
119 lines
5.3 KiB
XML
119 lines
5.3 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!--
|
|
Copyright (C) 2016 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.
|
|
-->
|
|
|
|
<PreferenceScreen
|
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
|
xmlns:settings="http://schemas.android.com/apk/res-auto"
|
|
android:key="language_and_input_settings_screen"
|
|
android:title="@string/language_settings"
|
|
settings:initialExpandedChildrenCount="3">
|
|
|
|
<Preference
|
|
android:key="phone_language"
|
|
android:title="@string/phone_language"
|
|
android:icon="@drawable/ic_translate_24dp"
|
|
android:fragment="com.android.settings.localepicker.LocaleListEditor" />
|
|
|
|
<PreferenceCategory
|
|
android:key="keyboards_category"
|
|
android:title="@string/keyboard_and_input_methods_category">
|
|
<Preference
|
|
android:key="virtual_keyboard_pref"
|
|
android:title="@string/virtual_keyboard_category"
|
|
android:fragment="com.android.settings.inputmethod.VirtualKeyboardFragment" />
|
|
<Preference
|
|
android:key="physical_keyboard_pref"
|
|
android:title="@string/physical_keyboard_title"
|
|
android:summary="@string/summary_placeholder"
|
|
android:fragment="com.android.settings.inputmethod.PhysicalKeyboardFragment"
|
|
settings:searchable="false"/>
|
|
</PreferenceCategory>
|
|
|
|
<PreferenceCategory
|
|
android:key="input_assistance_category"
|
|
android:title="@string/input_assistance">
|
|
<!-- Spell checker preference title, summary and fragment will be set programmatically. -->
|
|
<!-- Note: Mark this as persistent="false" to remove unnecessarily saved shared preference.
|
|
See: InputMethodAndSubtypeUtil.removeUnnecessaryNonPersistentPreference. -->
|
|
<Preference
|
|
android:key="spellcheckers_settings"
|
|
android:title="@string/spellcheckers_settings_title"
|
|
android:persistent="false"
|
|
android:fragment="com.android.settings.inputmethod.SpellCheckersSettings" />
|
|
|
|
<Preference
|
|
android:key="default_autofill"
|
|
android:title="@string/autofill_app"
|
|
android:fragment="com.android.settings.applications.defaultapps.AutofillPicker"
|
|
settings:keywords="@string/autofill_keywords" />
|
|
|
|
<!-- User dictionary preference title and fragment will be set programmatically. -->
|
|
<Preference
|
|
android:key="key_user_dictionary_settings"
|
|
android:title="@string/user_dict_settings_title"
|
|
android:fragment="com.android.settings.inputmethod.UserDictionaryList"
|
|
settings:controller="com.android.settings.language.UserDictionaryPreferenceController" />
|
|
</PreferenceCategory>
|
|
|
|
<PreferenceCategory
|
|
android:key="pointer_and_tts_category"
|
|
android:layout="@layout/preference_category_no_label">
|
|
|
|
<com.android.settings.PointerSpeedPreference
|
|
android:key="pointer_speed"
|
|
android:title="@string/pointer_speed"
|
|
android:dialogTitle="@string/pointer_speed" />
|
|
|
|
<Preference
|
|
android:key="tts_settings_summary"
|
|
android:title="@string/tts_settings_title"
|
|
android:fragment="com.android.settings.tts.TextToSpeechSettings"
|
|
settings:searchable="false"/>
|
|
|
|
</PreferenceCategory>
|
|
|
|
<SwitchPreference
|
|
android:key="vibrate_input_devices"
|
|
android:title="@string/vibrate_input_devices"
|
|
android:summary="@string/vibrate_input_devices_summary"
|
|
settings:controller="com.android.settings.inputmethod.GameControllerPreferenceController" />
|
|
|
|
<com.android.settings.widget.WorkOnlyCategory
|
|
android:key="language_and_input_for_work_category"
|
|
android:title="@string/language_and_input_for_work_category_title">
|
|
|
|
<Preference
|
|
android:key="virtual_keyboards_for_work_pref"
|
|
android:title="@string/virtual_keyboards_for_work_title"
|
|
android:fragment="com.android.settings.inputmethod.VirtualKeyboardFragment"
|
|
settings:controller="com.android.settings.inputmethod.VirtualKeyboardForWorkPreferenceController" />
|
|
|
|
<Preference
|
|
android:key="spellcheckers_settings_for_work_pref"
|
|
android:title="@string/spellcheckers_settings_for_work_title"
|
|
android:fragment="com.android.settings.inputmethod.SpellCheckersSettings"
|
|
settings:controller="com.android.settings.language.UserDictionaryForWorkPreferenceController" />
|
|
|
|
<Preference
|
|
android:key="user_dictionary_settings_for_work_pref"
|
|
android:title="@string/user_dict_settings_for_work_title"
|
|
android:fragment="com.android.settings.inputmethod.UserDictionaryList"
|
|
settings:controller="com.android.settings.inputmethod.SpellCheckerForWorkPreferenceController" />
|
|
</com.android.settings.widget.WorkOnlyCategory>
|
|
|
|
</PreferenceScreen>
|