Merge "Change Input Settings UI flow." (a1685248) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+14 −8

Original line number	Diff line number	Diff line
		@@ -577,10 +577,6 @@
		android:icon="@drawable/ic_settings_language"
		android:taskAffinity="com.android.settings"
		android:parentActivityName="Settings">
		<intent-filter android:priority="1">
		<action android:name="android.settings.INPUT_METHOD_SETTINGS" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />
		<category android:name="android.intent.category.VOICE_LAUNCH" />
		@@ -597,6 +593,16 @@
		android:value="true" />
		</activity>

		<activity android:name="Settings$AvailableVirtualKeyboardActivity"
		android:label="@string/available_virtual_keyboard_category">
		<intent-filter android:priority="1">
		<action android:name="android.settings.INPUT_METHOD_SETTINGS" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		android:value="com.android.settings.inputmethod.AvailableVirtualKeyboardFragment" />
		</activity>

		<activity android:name="Settings$ManageAssistActivity"
		android:label="@string/assist_and_voice_input_title"
		android:taskAffinity="com.android.settings"

res/values/strings.xml

+19 −0

Original line number	Diff line number	Diff line
		@@ -3500,6 +3500,25 @@
		<!-- Toast that settings for an application is failed to open. -->
		<string name="failed_to_open_app_settings_toast">Failed to open settings for <xliff:g id="spell_application_name">%1$s</xliff:g></string>

		<!-- Title for the 'keyboard and input methods' preference category. [CHAR LIMIT=35] -->
		<string name="keyboard_and_input_methods_category">Keyboard and input methods</string>
		<!-- Title for the 'virtual keyboard' preference sub-screen. [CHAR LIMIT=35] -->
		<string name="virtual_keyboard_category">Virtual keyboard</string>
		<!-- Title for the 'physical keyboard' preference sub-screen. [CHAR LIMIT=35] -->
		<string name="physical_keyboard_category">Physical keyboard</string>
		<!-- Title for the 'available virtual keyboard' preference sub-screen. [CHAR LIMIT=35] -->
		<string name="available_virtual_keyboard_category">Available virtual keyboard</string>
		<!-- Title for the button to trigger the 'available virtual keyboard' preference sub-screen. [CHAR LIMIT=35] -->
		<string name="add_virtual_keyboard">Add a virtual keyboard</string>
		<!-- Title for the 'keyboard assistance' preference category. [CHAR LIMIT=35] -->
		<string name="keyboard_assistance_category">Keyboard assistance</string>
		<!-- Title for the 'show virtual keyboard' preference switch. [CHAR LIMIT=35] -->
		<string name="show_ime">Show virtual keyboard</string>
		<!-- Summary text for the 'add virtual keyboard' preference sub-screen. [CHAR LIMIT=100] -->
		<string name="show_ime_summary">Keep it on screen while physical keyboard is active</string>
		<!-- Title for the button to trigger the 'keyboard shortcuts helper' dialog. [CHAR LIMIT=35] -->
		<string name="keyboard_shortcuts_helper">Keyboard shortcuts helper</string>

		<!-- On Language & input settings screen, heading. Inside the "Language & input settings" screen, this is the header for settings that relate to mouse and trackpad devices. [CHAR LIMIT=40] -->
		<string name="pointer_settings_category">Mouse/trackpad</string>
		<!-- On Language & input settings screen, setting summary. Setting for mouse pointer speed. [CHAR LIMIT=35] -->

res/xml/language_settings.xml

+25 −14

Original line number	Diff line number	Diff line
		@@ -41,23 +41,34 @@
		/>

		<PreferenceCategory
		android:key="keyboard_settings_category"
		android:title="@string/keyboard_settings_category">

		android:title="@string/keyboard_and_input_methods_category">
		<PreferenceScreen
		android:key="current_input_method"
		android:title="@string/current_input_method"
		/>
		<!-- Enabled input method list will be populated programmatically here. -->
		android:title="@string/virtual_keyboard_category"
		android:fragment="com.android.settings.inputmethod.VirtualKeyboardFragment" />
		<PreferenceScreen
		android:title="@string/physical_keyboard_category"
		android:fragment="com.android.settings.inputmethod.PhysicalKeyboardFragment" />
		</PreferenceCategory>

		<PreferenceCategory
		android:key="hard_keyboard"
		android:title="@string/builtin_keyboard_settings_title"
		android:persistent="false">
		<!-- Additional preference screens are inserted here programmatically
		with low order values to set the key map of each attached keyboard. -->
		</PreferenceCategory>
		<!-- Temporarily disabled: -->
		<!--<PreferenceCategory-->
		<!--android:key="keyboard_settings_category"-->
		<!--android:title="@string/keyboard_settings_category">-->

		<!--<PreferenceScreen-->
		<!--android:key="current_input_method"-->
		<!--android:title="@string/current_input_method"-->
		<!--/>-->
		<!--<!– Enabled input method list will be populated programmatically here. –>-->
		<!--</PreferenceCategory>-->

		<!--<PreferenceCategory-->
		<!--android:key="hard_keyboard"-->
		<!--android:title="@string/builtin_keyboard_settings_title"-->
		<!--android:persistent="false">-->
		<!--<!– Additional preference screens are inserted here programmatically-->
		<!--with low order values to set the key map of each attached keyboard. –>-->
		<!--</PreferenceCategory>-->

		<PreferenceCategory
		android:key="voice_category"

res/xml/physical_keyboard_settings.xml

0 → 100644

+35 −0

Original line number	Diff line number	Diff line
		<?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"
		android:title="@string/physical_keyboard_category">
		<!-- 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">
		<SwitchPreference
		android:key="show_virtual_keyboard_switch"
		android:title="@string/show_ime"
		android:summary="@string/show_ime_summary"
		android:defaultValue="false" />

		<!-- TODO: Get summary text from UX -->
		<Preference
		android:key="keyboard_shortcuts_helper"
		android:title="@string/keyboard_shortcuts_helper"
		android:summary="@null" />
		</PreferenceCategory>
		</PreferenceScreen>

res/xml/virtual_keyboard_settings.xml

0 → 100644

+23 −0

Original line number	Diff line number	Diff line
		<?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"
		android:title="@string/virtual_keyboard_category">
		<!-- Enabled input method list will be populated programmatically here. -->
		<PreferenceScreen
		android:key="add_virtual_keyboard_screen"
		android:title="@string/add_virtual_keyboard"
		android:fragment="com.android.settings.inputmethod.AvailableVirtualKeyboardFragment" />
		</PreferenceScreen>