commit 976bb3f45915bdd5165d9a50402d4c1163dae809
author Abodunrinwa Toki <toki@google.com> Wed Jan 20 18:43:20 2016 +0000
committer Abodunrinwa Toki <toki@google.com> Fri Jan 22 18:24:44 2016 +0000
tree 9ac75857b3b8b5fa5dc0c0139b31ec766e04bd60
parent f9d330448b34e1767f3b9d0814bf8779488ca86b

Change Input Settings UI flow.

1. Introduces new UI components as per the new flow
2. Temporarily disables components in the old flow that are to be
   replaced by the new flow. This is done so we can neatly revert
   to the old flow if there are issues with the new flow
3. AvailableVirtualKeyboardActivity now responds to
   android.settings.INPUT_METHOD_SETTINGS intents instead of
   InputMethodAndLanguageSettingsActivity

Bug: 25752812
Change-Id: I728d7ee185827ed328c16cb7abce244557a26518

res/xml/language_settings.xml

diff --git a/res/xml/language_settings.xml b/res/xml/language_settings.xml
index 83a0985..9cc0145 100644
--- a/res/xml/language_settings.xml
+++ b/res/xml/language_settings.xml
@@ -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"-->
+                <!--/>-->
+        <!--&lt;!&ndash; Enabled input method list will be populated programmatically here. &ndash;&gt;-->
+    <!--</PreferenceCategory>-->
+
+    <!--<PreferenceCategory-->
+            <!--android:key="hard_keyboard"-->
+            <!--android:title="@string/builtin_keyboard_settings_title"-->
+            <!--android:persistent="false">-->
+        <!--&lt;!&ndash; Additional preference screens are inserted here programmatically-->
+             <!--with low order values to set the key map of each attached keyboard. &ndash;&gt;-->
+    <!--</PreferenceCategory>-->
 
     <PreferenceCategory
             android:key="voice_category"