Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Implement new keyboard settings UI."

Browse Source
This commit is contained in:
TreeHugger Robot
2022-12-13 05:28:07 +00:00
committed by Android (Google) Code Review
parent d115638c36 1639782df6
commit beee3044d8
22 changed files with 898 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/xml/bluetooth_device_details_fragment.xml
View File

@@ -88,6 +88,12 @@
settings:controller="com.android.settings.accessibility.LiveCaptionPreferenceController"/>
</PreferenceCategory>
<Preference
android:key="keyboard_settings"
android:persistent="false"
android:title="@string/bluetooth_device_keyboard_settings_preference_title"
settings:controller="com.android.settings.inputmethod.KeyboardSettingsPreferenceController"/>
<com.android.settingslib.widget.FooterPreference
android:key="device_details_footer"
android:selectable="false"

3
res/xml/keyboard_settings.xml
View File

@@ -20,8 +20,7 @@
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:title="@string/keyboard_settings">
<PreferenceCategory
android:key="keyboards_category"
android:title="@string/keyboard_and_input_methods_category">
android:key="keyboards_category">
<Preference
android:key="virtual_keyboard_pref"
android:title="@string/virtual_keyboard_category"

23
res/xml/keyboard_settings_enabled_locales_list.xml Normal file
View File

@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2022 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"
android:title="@string/physical_keyboard_title">
<PreferenceCategory
android:key="enabled_locales_keyboard_layout"
android:title="@string/enabled_locales_keyboard_layout">
</PreferenceCategory>
</PreferenceScreen>

21
res/xml/new_keyboard_layout_picker_fragment.xml Normal file
View File

@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2022 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="keyboard_layout_picker_list"
settings:controller="com.android.settings.inputmethod.NewKeyboardLayoutPickerController">
</PreferenceScreen>

24
res/xml/new_keyboard_layout_picker_title.xml Normal file
View File

@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2022 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"
android:key="keyboard_layout_picker_title">
<!-- Separate title from new_keyboard_layout_picker_fragment to avoid being moved to the top -->
<PreferenceCategory
android:key="keyboard_layout_picker_title"
android:title="@string/keyboard_layout_picker_category_title">
</PreferenceCategory>
</PreferenceScreen>

4
res/xml/physical_keyboard_settings.xml
View File

@@ -19,8 +19,8 @@
<!-- Additional preference screens are inserted here programmatically
with low order values to set the key map of each attached keyboard. -->
<PreferenceCategory
android:key="keyboard_assistance_category"
android:title="@string/keyboard_assistance_category">
android:key="keyboard_options_category"
android:title="@string/keyboard_options_category">
<SwitchPreference
android:key="show_virtual_keyboard_switch"
android:title="@string/show_ime"