More cleanup in input & language settings.

- Removed unused preferences that are commented out in pref xml.
- Also removed code that references to them in Fragment.

Bug: 32637613
Test: compile/manual
Change-Id: I84be24f9c5df7531843f03b047a93f9aa912432e
diff --git a/res/xml/language_settings.xml b/res/xml/language_settings.xml
index 9074d0a..d829dc4 100644
--- a/res/xml/language_settings.xml
+++ b/res/xml/language_settings.xml
@@ -15,9 +15,8 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
-        android:key="language_keyboard_settings"
-        android:title="@string/language_keyboard_settings_title">
+                  android:key="language_keyboard_settings"
+                  android:title="@string/language_keyboard_settings_title">
 
     <PreferenceScreen
             android:key="phone_language"
@@ -50,26 +49,6 @@
             android:fragment="com.android.settings.inputmethod.PhysicalKeyboardFragment" />
     </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"
             android:title="@string/voice_category" >