diff options
| -rw-r--r-- | res/values/arrays.xml | 10 | ||||
| -rw-r--r-- | res/values/strings.xml | 4 | ||||
| -rw-r--r-- | res/xml/settings.xml | 1 | ||||
| -rw-r--r-- | srcs/juloo.keyboard2/Config.java | 3 | ||||
| -rw-r--r-- | srcs/juloo.keyboard2/Pointers.java | 3 |
5 files changed, 18 insertions, 3 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index b82298e..e5d8c11 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -94,4 +94,14 @@ <item>number</item> <item>normal</item> </string-array> + <string-array name="pref_slider_sensitivity_entries"> + <item>@string/pref_slider_sensitivity_slow</item> + <item>@string/pref_slider_sensitivity_medium</item> + <item>@string/pref_slider_sensitivity_fast</item> + </string-array> + <string-array name="pref_slider_sensitivity_values"> + <item>60</item> + <item>30</item> + <item>15</item> + </string-array> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index 26c8ce9..5564cc5 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -88,6 +88,10 @@ <string name="pref_circle_sensitivity_e_medium">Medium</string> <string name="pref_circle_sensitivity_e_low">Low</string> <string name="pref_circle_sensitivity_e_disabled">Disabled</string> + <string name="pref_slider_sensitivity_title">Space bar slider sensitivity</string> + <string name="pref_slider_sensitivity_slow">Slow</string> + <string name="pref_slider_sensitivity_medium">Medium</string> + <string name="pref_slider_sensitivity_fast">Fast</string> <string name="key_action_next">Next</string> <string name="key_action_done">Done</string> <string name="key_action_go">Go</string> diff --git a/res/xml/settings.xml b/res/xml/settings.xml index 40e3676..22dbef2 100644 --- a/res/xml/settings.xml +++ b/res/xml/settings.xml @@ -15,6 +15,7 @@ <PreferenceCategory android:title="@string/pref_category_typing"> <ListPreference android:key="swipe_dist" android:title="@string/pref_swipe_dist_title" android:summary="@string/pref_swipe_dist_summary" android:defaultValue="15" android:entries="@array/pref_swipe_dist_entries" android:entryValues="@array/pref_swipe_dist_values"/> <ListPreference android:key="circle_sensitivity" android:title="@string/pref_circle_sensitivity_title" android:summary="%s" android:defaultValue="2" android:entries="@array/pref_circle_sensitivity_entries" android:entryValues="@array/pref_circle_sensitivity_values"/> + <ListPreference android:key="slider_sensitivity" android:title="@string/pref_slider_sensitivity_title" android:summary="%s" android:defaultValue="30" android:entries="@array/pref_slider_sensitivity_entries" android:entryValues="@array/pref_slider_sensitivity_values"/> <juloo.keyboard2.prefs.IntSlideBarPreference android:key="longpress_timeout" android:title="@string/pref_long_timeout_title" android:summary="%sms" android:defaultValue="600" min="50" max="2000"/> <CheckBoxPreference android:key="keyrepeat_enabled" android:title="@string/pref_keyrepeat_enabled" android:defaultValue="true"/> <juloo.keyboard2.prefs.IntSlideBarPreference android:key="longpress_interval" android:dependency="keyrepeat_enabled" android:title="@string/pref_long_interval_title" android:summary="%sms" android:defaultValue="25" min="5" max="100"/> diff --git a/srcs/juloo.keyboard2/Config.java b/srcs/juloo.keyboard2/Config.java index 06a82db..6ca8113 100644 --- a/srcs/juloo.keyboard2/Config.java +++ b/srcs/juloo.keyboard2/Config.java @@ -144,7 +144,8 @@ public final class Config float swipe_scaling = Math.min(dm.widthPixels, dm.heightPixels) / 10.f * dpi_ratio; float swipe_dist_value = Float.valueOf(_prefs.getString("swipe_dist", "15")); swipe_dist_px = swipe_dist_value / 25.f * swipe_scaling; - slide_step_px = 0.4f * swipe_scaling; + float slider_sensitivity = Float.valueOf(_prefs.getString("slider_sensitivity", "30")) / 100.f; + slide_step_px = slider_sensitivity * swipe_scaling; vibrate_custom = _prefs.getBoolean("vibrate_custom", false); vibrate_duration = _prefs.getInt("vibrate_duration", 20); longPressTimeout = _prefs.getInt("longpress_timeout", 600); diff --git a/srcs/juloo.keyboard2/Pointers.java b/srcs/juloo.keyboard2/Pointers.java index 90cfc28..62fdbb8 100644 --- a/srcs/juloo.keyboard2/Pointers.java +++ b/srcs/juloo.keyboard2/Pointers.java @@ -473,7 +473,6 @@ public final class Pointers implements Handler.Callback stopLongPress(ptr); ptr.flags |= FLAG_P_SLIDING; ptr.sliding = new Sliding(x, y, dirx, diry, kv.getSlider()); - _handler.onPointerDown(kv, true); } /** Return the [FLAG_P_*] flags that correspond to pressing [kv]. */ @@ -622,7 +621,7 @@ public final class Pointers implements Handler.Callback float travelled = Math.abs(x - last_x) + Math.abs(y - last_y); if (last_move_ms == -1) { - if (travelled < _config.swipe_dist_px) + if (travelled < (_config.swipe_dist_px + _config.slide_step_px)) return; last_move_ms = System.currentTimeMillis(); } |