Introduce boolean flags to show/hide items for Language & input.

This adds seven new boolean flags:
config_show_phone_language
config_show_virtual_keyboard_pref
config_show_physical_keyboard_pref
config_show_spellcheckers_settings
config_show_tts_settings_summary
config_show_pointer_speed
config_show_vibrate_input_devices

Which when individually set to false, will hide the item from "Language
& input" in System. It will also hide them from surfacing in search
results.

Bug: 62379555
Test: Individual controller tests are all updated.

Change-Id: I9ef1c3037b0bec6ffa5a627006507f4f16e534c4

src/com/android/settings/language/LanguageAndInputSettings.java

@@ -21,6 +21,7 @@ import android.content.ComponentName;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.pm.PackageManager;
+import android.os.Bundle;
 import android.provider.SearchIndexableResource;
 import android.provider.Settings;
 import android.speech.tts.TtsEngines;
@@ -40,6 +41,7 @@ import com.android.settings.inputmethod.PhysicalKeyboardPreferenceController;
 import com.android.settings.inputmethod.SpellCheckerPreferenceController;
 import com.android.settings.inputmethod.VirtualKeyboardPreferenceController;
 import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.widget.PreferenceCategoryController;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
@@ -51,7 +53,10 @@ public class LanguageAndInputSettings extends DashboardFragment {
 
     private static final String TAG = "LangAndInputSettings";
 
+    private static final String KEY_KEYBOARDS_CATEGORY = "keyboards_category";
     private static final String KEY_TEXT_TO_SPEECH = "tts_settings_summary";
+    private static final String KEY_POINTER_AND_TTS_CATEGORY = "pointer_and_tts_category";
+    private static final String KEY_GAME_CONTROLLER_CATEGORY = "game_controller_settings_category";
     private static final String KEY_PHYSICAL_KEYBOARD = "physical_keyboard_pref";
 
     @Override
@@ -92,20 +97,45 @@ public class LanguageAndInputSettings extends DashboardFragment {
         final List<AbstractPreferenceController> controllers = new ArrayList<>();
         // Language
         controllers.add(new PhoneLanguagePreferenceController(context));
-        controllers.add(new SpellCheckerPreferenceController(context));
-        controllers.add(new UserDictionaryPreferenceController(context));
-        controllers.add(new TtsPreferenceController(context, new TtsEngines(context)));
+
         // Input
-        controllers.add(new VirtualKeyboardPreferenceController(context));
-        controllers.add(new PhysicalKeyboardPreferenceController(context, lifecycle));
+        final VirtualKeyboardPreferenceController virtualKeyboardPreferenceController =
+                new VirtualKeyboardPreferenceController(context);
+        final PhysicalKeyboardPreferenceController physicalKeyboardPreferenceController =
+                new PhysicalKeyboardPreferenceController(context, lifecycle);
+        controllers.add(virtualKeyboardPreferenceController);
+        controllers.add(physicalKeyboardPreferenceController);
+        controllers.add(new PreferenceCategoryController(context,
+                KEY_KEYBOARDS_CATEGORY,
+                Arrays.asList(virtualKeyboardPreferenceController,
+                        physicalKeyboardPreferenceController)));
+
+        // Pointer and Tts
+        final TtsPreferenceController ttsPreferenceController =
+                new TtsPreferenceController(context, new TtsEngines(context));
+        controllers.add(ttsPreferenceController);
+        final PointerSpeedController pointerController = new PointerSpeedController(context);
+        controllers.add(pointerController);
+        controllers.add(new PreferenceCategoryController(context,
+                KEY_POINTER_AND_TTS_CATEGORY,
+                Arrays.asList(pointerController, ttsPreferenceController)));
+
+        // Input Assistance
+        controllers.add(new SpellCheckerPreferenceController(context));
+        controllers.add(new DefaultAutofillPreferenceController(context));
+        controllers.add(new UserDictionaryPreferenceController(context));
+
+        // Game Controller
         final GameControllerPreferenceController gameControllerPreferenceController
                 = new GameControllerPreferenceController(context);
         if (lifecycle != null) {
             lifecycle.addObserver(gameControllerPreferenceController);
         }
-
         controllers.add(gameControllerPreferenceController);
-        controllers.add(new DefaultAutofillPreferenceController(context));
+        controllers.add(new PreferenceCategoryController(context,
+                KEY_GAME_CONTROLLER_CATEGORY,
+                Arrays.asList(gameControllerPreferenceController)));
+
         return controllers;
     }
 

src/com/android/settings/language/PhoneLanguagePreferenceController.java

@@ -41,7 +41,8 @@ public class PhoneLanguagePreferenceController extends AbstractPreferenceControl
 
     @Override
     public boolean isAvailable() {
-        return mContext.getAssets().getLocales().length > 1;
+        return mContext.getResources().getBoolean(R.bool.config_show_phone_language)
+                && mContext.getAssets().getLocales().length > 1;
     }
 
     @Override

src/com/android/settings/language/PointerSpeedController.java

@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2017 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.
+ */
+
+package com.android.settings.language;
+
+import android.content.Context;
+
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.R;
+
+import android.support.annotation.VisibleForTesting;
+
+
+public class PointerSpeedController extends BasePreferenceController {
+
+    @VisibleForTesting static final String KEY_POINTER_SPEED = "pointer_speed";
+
+    public PointerSpeedController(Context context) {
+        super(context, KEY_POINTER_SPEED);
+    }
+
+    @AvailabilityStatus
+    public int getAvailabilityStatus() {
+        return mContext.getResources().getBoolean(R.bool.config_show_pointer_speed)
+                ? AVAILABLE
+                : DISABLED_UNSUPPORTED;
+    }
+}

src/com/android/settings/language/TtsPreferenceController.java

@@ -20,6 +20,7 @@ import android.content.Context;
 import android.speech.tts.TtsEngines;
 
 import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.R;
 import com.android.settingslib.core.AbstractPreferenceController;
 
 public class TtsPreferenceController extends AbstractPreferenceController
@@ -37,7 +38,8 @@ public class TtsPreferenceController extends AbstractPreferenceController
 
     @Override
     public boolean isAvailable() {
-        return !mTtsEngines.getEngines().isEmpty();
+        return !mTtsEngines.getEngines().isEmpty() &&
+                mContext.getResources().getBoolean(R.bool.config_show_tts_settings_summary);
     }
 
     @Override