From 42d9980a84fa8f639638269a8498aa54e85b2eb4 Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Mon, 18 Nov 2013 15:13:55 +0900
Subject: Rename ambiguous feature name and related resources

Bug: 11737015
Change-Id: I39f7ca13b99f019a2edb5aa690e3142ceba4e837
---
 java/res/values-sw540dp/config.xml | 2 +-
 java/res/values-sw768dp/config.xml | 2 +-
 java/res/values/attrs.xml          | 4 ++--
 java/res/values/config.xml         | 2 +-
 java/res/values/themes-common.xml  | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'java/res')

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 f2dc47357..02e36fe97 100644
--- a/java/res/values/attrs.xml
+++ b/java/res/values/attrs.xml
@@ -87,8 +87,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 298936d9c..774c01ca5 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>
-- 
cgit v1.2.3-83-g751a