diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2013-11-21 09:05:38 +0000 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2013-11-21 09:05:39 +0000 |
| commit | afb95c79677d50b05f0b034dba16ccb522750c1c (patch) | |
| tree | da4cfaf3810dce711414cfc0622c1f2250259fe8 /java/res | |
| parent | 9882fbb2eef81158e2d789e624d56d12b844f991 (diff) | |
| parent | 42d9980a84fa8f639638269a8498aa54e85b2eb4 (diff) | |
| download | latinime-afb95c79677d50b05f0b034dba16ccb522750c1c.tar.gz latinime-afb95c79677d50b05f0b034dba16ccb522750c1c.tar.xz latinime-afb95c79677d50b05f0b034dba16ccb522750c1c.zip | |
Merge "Rename ambiguous feature name and related resources"
Diffstat (limited to 'java/res')
| -rw-r--r-- | java/res/values-sw540dp/config.xml | 2 | ||||
| -rw-r--r-- | java/res/values-sw768dp/config.xml | 2 | ||||
| -rw-r--r-- | java/res/values/attrs.xml | 4 | ||||
| -rw-r--r-- | java/res/values/config.xml | 2 | ||||
| -rw-r--r-- | java/res/values/themes-common.xml | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/java/res/values-sw540dp/config.xml b/java/res/values-sw540dp/config.xml index ac992ea23..b1e578366 100644 --- a/java/res/values-sw540dp/config.xml +++ b/java/res/values-sw540dp/config.xml @@ -31,7 +31,7 @@ Configuration for MainKeyboardView --> <dimen name="config_key_hysteresis_distance">40.0dp</dimen> - <bool name="config_sliding_key_input_enabled">false</bool> + <bool name="config_key_selection_by_dragging_finger">false</bool> <!-- Showing more keys keyboard, just above the touched point if true, aligned to the key if false --> <bool name="config_show_more_keys_keyboard_at_touched_point">true</bool> diff --git a/java/res/values-sw768dp/config.xml b/java/res/values-sw768dp/config.xml index c5c6aa4bf..a3f5de95b 100644 --- a/java/res/values-sw768dp/config.xml +++ b/java/res/values-sw768dp/config.xml @@ -29,7 +29,7 @@ <!-- Configuration for MainKeyboardView --> - <bool name="config_sliding_key_input_enabled">false</bool> + <bool name="config_key_selection_by_dragging_finger">false</bool> <!-- Showing more keys keyboard, just above the touched point if true, aligned to the key if false --> <bool name="config_show_more_keys_keyboard_at_touched_point">true</bool> diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml index 11ab24481..e8e139da3 100644 --- a/java/res/values/attrs.xml +++ b/java/res/values/attrs.xml @@ -89,8 +89,8 @@ <attr name="touchNoiseThresholdTime" format="integer" /> <!-- Touch noise threshold distance in millimeter --> <attr name="touchNoiseThresholdDistance" format="dimension" /> - <!-- Sliding key input enable --> - <attr name="slidingKeyInputEnable" format="boolean" /> + <!-- Enable key selection by dragging finger --> + <attr name="keySelectionByDraggingFinger" format="boolean" /> <attr name="slidingKeyInputPreviewColor" format="color" /> <attr name="slidingKeyInputPreviewWidth" format="dimension" /> <attr name="slidingKeyInputPreviewBodyRatio" format="integer" /> diff --git a/java/res/values/config.xml b/java/res/values/config.xml index 61779d4b5..1b42d0b33 100644 --- a/java/res/values/config.xml +++ b/java/res/values/config.xml @@ -53,7 +53,7 @@ <integer name="config_touch_noise_threshold_time">40</integer> <dimen name="config_touch_noise_threshold_distance">12.6dp</dimen> <integer name="config_key_preview_linger_timeout">70</integer> - <bool name="config_sliding_key_input_enabled">true</bool> + <bool name="config_key_selection_by_dragging_finger">true</bool> <!-- Sliding key input preview parameters --> <dimen name="config_sliding_key_input_preview_width">8.0dp</dimen> <!-- Percentages of sliding key input preview body and shadow, in proportion to the width. diff --git a/java/res/values/themes-common.xml b/java/res/values/themes-common.xml index 75756ea7a..64e8c87b4 100644 --- a/java/res/values/themes-common.xml +++ b/java/res/values/themes-common.xml @@ -67,7 +67,7 @@ <item name="keyHysteresisDistanceForSlidingModifier">@dimen/config_key_hysteresis_distance_for_sliding_modifier</item> <item name="touchNoiseThresholdTime">@integer/config_touch_noise_threshold_time</item> <item name="touchNoiseThresholdDistance">@dimen/config_touch_noise_threshold_distance</item> - <item name="slidingKeyInputEnable">@bool/config_sliding_key_input_enabled</item> + <item name="keySelectionByDraggingFinger">@bool/config_key_selection_by_dragging_finger</item> <item name="slidingKeyInputPreviewWidth">@dimen/config_sliding_key_input_preview_width</item> <item name="slidingKeyInputPreviewBodyRatio">@integer/config_sliding_key_input_preview_body_ratio</item> <item name="slidingKeyInputPreviewShadowRatio">@integer/config_sliding_key_input_preview_shadow_ratio</item> @@ -130,4 +130,4 @@ <item name="android:windowEnterAnimation">@anim/more_keys_keyboard_fadein</item> <item name="android:windowExitAnimation">@anim/more_keys_keyboard_fadeout</item> </style> -</resources>
\ No newline at end of file +</resources> |