Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1f6f24d authored by Ben Lin's avatar Ben Lin Committed by Android (Google) Code Review
Browse files

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

parents 537f0b81 c28b46f2

res/values/bools.xml

+21 −0
Original line number Diff line number Diff line
@@ -72,6 +72,27 @@ 
    <!-- Whether enabled_vr_listeners should be shown or not. -->

    <bool name="config_show_enabled_vr_listeners">true</bool>



    <!-- Whether phone_language should be shown or not. -->

    <bool name="config_show_phone_language">true</bool>



    <!-- Whether virtual_keyboard_pref should be shown or not. -->

    <bool name="config_show_virtual_keyboard_pref">true</bool>



    <!-- Whether physical_keyboard_pref should be shown or not. -->

    <bool name="config_show_physical_keyboard_pref">true</bool>



    <!-- Whether spellcheckers_settings should be shown or not. -->

    <bool name="config_show_spellcheckers_settings">true</bool>



    <!-- Whether tts_settings_summary should be shown or not. -->

    <bool name="config_show_tts_settings_summary">true</bool>



    <!-- Whether pointer_speed should be shown or not. -->

    <bool name="config_show_pointer_speed">true</bool>



    <!-- Whether vibrate_input_devices should be shown or not. -->

    <bool name="config_show_vibrate_input_devices">true</bool>



    <!-- Whether wallpaper attribution should be shown or not. -->

    <bool name="config_show_wallpaper_attribution">true</bool>

src/com/android/settings/inputmethod/GameControllerPreferenceController.java

+6 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import android.text.TextUtils; 
import android.view.InputDevice;



import com.android.settings.core.PreferenceControllerMixin;

import com.android.settings.R;

import com.android.settingslib.core.AbstractPreferenceController;

import com.android.settingslib.core.lifecycle.LifecycleObserver;

import com.android.settingslib.core.lifecycle.events.OnPause;
@@ -73,6 +74,11 @@ public class GameControllerPreferenceController extends AbstractPreferenceContro 


    @Override

    public boolean isAvailable() {

        // If device explicitly wants to hide this, return early.

        if (!mContext.getResources().getBoolean(R.bool.config_show_vibrate_input_devices)) {

            return false;

        }



        final int[] devices = mIm.getInputDeviceIds();

        for (int deviceId : devices) {

            InputDevice device = mIm.getInputDevice(deviceId);

src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ public class PhysicalKeyboardPreferenceController extends AbstractPreferenceCont 


    @Override

    public boolean isAvailable() {

        return true;

        return mContext.getResources().getBoolean(R.bool.config_show_physical_keyboard_pref);

    }



    @Override

src/com/android/settings/inputmethod/SpellCheckerPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ public class SpellCheckerPreferenceController extends AbstractPreferenceControll 


    @Override

    public boolean isAvailable() {

        return true;

        return mContext.getResources().getBoolean(R.bool.config_show_spellcheckers_settings);

    }



    @Override

src/com/android/settings/inputmethod/VirtualKeyboardPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ public class VirtualKeyboardPreferenceController extends AbstractPreferenceContr 


    @Override

    public boolean isAvailable() {

        return true;

        return mContext.getResources().getBoolean(R.bool.config_show_virtual_keyboard_pref);

    }



    @Override