am f6aed4bd: Merge "Add summary text to sliding key input preview settings"

# Via Android (Google) Code Review (1) and Tadashi G. Takaoka (1)
* commit 'f6aed4bdd2ba8814cbd4f7cdeead629b068f4a75':
  Add summary text to sliding key input preview settings
main
Tadashi G. Takaoka 2013-01-29 00:59:08 -08:00 committed by Android Git Automerger
commit b6b7a37973
2 changed files with 5 additions and 2 deletions

View File

@ -69,8 +69,10 @@
<!-- Option summary for showing language switch key [CHAR LIMIT=65] --> <!-- Option summary for showing language switch key [CHAR LIMIT=65] -->
<string name="show_language_switch_key_summary">Show when multiple input languages are enabled</string> <string name="show_language_switch_key_summary">Show when multiple input languages are enabled</string>
<!-- Option to enable sliding key input preview. The user can see a rubber band during sliding key input. [CHAR LIMIT=30]--> <!-- Option to enable sliding key input indicator. The user can see a rubber band-like effect during sliding key input. [CHAR LIMIT=30]-->
<string name="sliding_key_input_preview">Sliding key input preview</string> <string name="sliding_key_input_preview">Show slide indicator</string>
<!-- Option summary to enable sliding key input indicator. The user can see a rubber band-like effect during sliding key input. [CHAR LIMIT=65]-->
<string name="sliding_key_input_preview_summary">Display visual cue while sliding from Shift or Symbol keys</string>
<!-- Option for the dismiss delay of the key popup [CHAR LIMIT=25] --> <!-- Option for the dismiss delay of the key popup [CHAR LIMIT=25] -->
<string name="key_preview_popup_dismiss_delay">Key popup dismiss delay</string> <string name="key_preview_popup_dismiss_delay">Key popup dismiss delay</string>

View File

@ -145,6 +145,7 @@
<CheckBoxPreference <CheckBoxPreference
android:key="pref_sliding_key_input_preview" android:key="pref_sliding_key_input_preview"
android:title="@string/sliding_key_input_preview" android:title="@string/sliding_key_input_preview"
android:summary="@string/sliding_key_input_preview_summary"
android:persistent="true" android:persistent="true"
android:defaultValue="true" /> android:defaultValue="true" />
<ListPreference <ListPreference