From f8fb0e5b240b1e954660b8221eaa9a18a310a1df Mon Sep 17 00:00:00 2001 From: Jeff Brown Date: Fri, 13 Apr 2012 20:27:45 -0700 Subject: Add setting to redirect vibrator to game controller. Bug: 6334179 Change-Id: I62c9c163aa4ee2c88286daee77641418869a1dab --- res/values/strings.xml | 8 ++++ res/xml/language_settings.xml | 10 +++++ .../InputMethodAndLanguageSettings.java | 49 +++++++++++++++++++--- 3 files changed, 61 insertions(+), 6 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 6d7994f..fefd2ee 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -2613,11 +2613,19 @@ card numbers. It comes from the app %1$s. Use this spell checker? + Mouse/trackpad Pointer speed + + Game Controller + + Use vibrator + + Redirect vibrator to game controller when connected. + Choose keyboard layout diff --git a/res/xml/language_settings.xml b/res/xml/language_settings.xml index cfcc341..f001486 100644 --- a/res/xml/language_settings.xml +++ b/res/xml/language_settings.xml @@ -92,4 +92,14 @@ android:title="@string/pointer_speed" android:dialogTitle="@string/pointer_speed" /> + + + + diff --git a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java index 7d02a1f..e764a73 100644 --- a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java +++ b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java @@ -73,6 +73,7 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment private ListPreference mShowInputMethodSelectorPref; private PreferenceCategory mKeyboardSettingsCategory; private PreferenceCategory mHardKeyboardCategory; + private PreferenceCategory mGameControllerCategory; private Preference mLanguagePref; private final ArrayList mInputMethodPreferenceList = new ArrayList(); @@ -118,6 +119,8 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment mHardKeyboardCategory = (PreferenceCategory)findPreference("hard_keyboard"); mKeyboardSettingsCategory = (PreferenceCategory)findPreference( "keyboard_settings_category"); + mGameControllerCategory = (PreferenceCategory)findPreference( + "game_controller_settings_category"); // Filter out irrelevant features if invoked from IME settings button. mIsOnlyImeSettings = Settings.ACTION_INPUT_METHOD_SETTINGS.equals( @@ -159,9 +162,9 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment } } - // Build hard keyboard preference category. + // Build hard keyboard and game controller preference categories. mIm = (InputManager)getActivity().getSystemService(Context.INPUT_SERVICE); - updateHardKeyboards(); + updateInputDevices(); // Spell Checker final Intent intent = new Intent(Intent.ACTION_MAIN); @@ -245,7 +248,7 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment } } - updateHardKeyboards(); + updateInputDevices(); // IME InputMethodAndSubtypeUtil.loadInputMethodSubtypeList( @@ -268,17 +271,17 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment @Override public void onInputDeviceAdded(int deviceId) { - updateHardKeyboards(); + updateInputDevices(); } @Override public void onInputDeviceChanged(int deviceId) { - updateHardKeyboards(); + updateInputDevices(); } @Override public void onInputDeviceRemoved(int deviceId) { - updateHardKeyboards(); + updateInputDevices(); } @Override @@ -306,6 +309,11 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment } } } + if (chkPref == mGameControllerCategory.findPreference("vibrate_input_devices")) { + System.putInt(getContentResolver(), Settings.System.VIBRATE_INPUT_DEVICES, + chkPref.isChecked() ? 1 : 0); + return true; + } } return super.onPreferenceTreeClick(preferenceScreen, preference); } @@ -382,6 +390,11 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment return pref; } + private void updateInputDevices() { + updateHardKeyboards(); + updateGameControllers(); + } + private void updateHardKeyboards() { mHardKeyboardPreferenceList.clear(); if (getResources().getConfiguration().keyboard == Configuration.KEYBOARD_QWERTY) { @@ -436,6 +449,30 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment } } + private void updateGameControllers() { + if (haveInputDeviceWithVibrator()) { + getPreferenceScreen().addPreference(mGameControllerCategory); + + CheckBoxPreference chkPref = (CheckBoxPreference) + mGameControllerCategory.findPreference("vibrate_input_devices"); + chkPref.setChecked(System.getInt(getContentResolver(), + Settings.System.VIBRATE_INPUT_DEVICES, 1) > 0); + } else { + getPreferenceScreen().removePreference(mGameControllerCategory); + } + } + + private boolean haveInputDeviceWithVibrator() { + final int[] devices = InputDevice.getDeviceIds(); + for (int i = 0; i < devices.length; i++) { + InputDevice device = InputDevice.getDevice(devices[i]); + if (device != null && !device.isVirtual() && device.getVibrator().hasVibrator()) { + return true; + } + } + return false; + } + private class SettingsObserver extends ContentObserver { public SettingsObserver(Handler handler, Context context) { super(handler); -- cgit v1.1