Merge "Add setting to redirect vibrator to game controller."

This commit is contained in:
Jeff Brown
2012-04-13 20:40:06 -07:00
committed by Android (Google) Code Review
3 changed files with 61 additions and 6 deletions

View File

@@ -2613,11 +2613,19 @@
card numbers. It comes from the app
<xliff:g id="spellchecker_application_name">%1$s</xliff:g>.
Use this spell checker?</string>
<!-- On Language & input settings screen, heading. Inside the "Language & input settings" screen, this is the header for settings that relate to mouse and trackpad devices. [CHAR LIMIT=40] -->
<string name="pointer_settings_category">Mouse/trackpad</string>
<!-- On Language & input settings screen, setting summary. Setting for mouse pointer speed. [CHAR LIMIT=35] -->
<string name="pointer_speed">Pointer speed</string>
<!-- On Language & input settings screen, heading. Inside the "Language & input settings" screen, this is the header for settings that relate to game controller devices. [CHAR LIMIT=40] -->
<string name="game_controller_settings_category">Game Controller</string>
<!-- On Language & input settings screen, setting title. Setting to redirect vibration to input devices. [CHAR LIMIT=35] -->
<string name="vibrate_input_devices">Use vibrator</string>
<!-- On Language & input settings screen, setting summary. Setting to redirect vibration to input devices. [CHAR LIMIT=100] -->
<string name="vibrate_input_devices_summary">Redirect vibrator to game controller when connected.</string>
<!-- Keyboard Layout Picker --> <skip />
<!-- Title for the keyboard layout picker activity. [CHAR LIMIT=35] -->
<string name="keyboard_layout_picker_title">Choose keyboard layout</string>

View File

@@ -92,4 +92,14 @@
android:title="@string/pointer_speed"
android:dialogTitle="@string/pointer_speed" />
</PreferenceCategory>
<PreferenceCategory android:key="game_controller_settings_category"
android:title="@string/game_controller_settings_category">
<CheckBoxPreference
android:key="vibrate_input_devices"
android:title="@string/vibrate_input_devices"
android:summaryOn="@string/vibrate_input_devices_summary"
android:summaryOff="@string/vibrate_input_devices_summary"
android:persistent="false"/>
</PreferenceCategory>
</PreferenceScreen>