aboutsummaryrefslogtreecommitdiffstats
path: root/app/src
diff options
context:
space:
mode:
authorKenny Root <kenny@the-b.org>2015-07-29 16:05:36 -0700
committerKenny Root <kenny@the-b.org>2015-07-29 16:05:36 -0700
commitffdd6e19460c19e4c14226d60ea2249f913d2b8a (patch)
treeb6b3295f84617ae2ec24503270d97e666d3dc8a1 /app/src
parentbe7656625120c781234727d93b3f8cabcc4012a3 (diff)
parent125be93257c9ea04650a0dddf7213741eba1913f (diff)
downloadconnectbot-ffdd6e19460c19e4c14226d60ea2249f913d2b8a.tar.gz
connectbot-ffdd6e19460c19e4c14226d60ea2249f913d2b8a.tar.bz2
connectbot-ffdd6e19460c19e4c14226d60ea2249f913d2b8a.zip
Merge pull request #111 from jklein24/touchslop
Use scaled touch slop for determining the scroll x-tolerance.
Diffstat (limited to 'app/src')
-rw-r--r--app/src/main/java/org/connectbot/ConsoleActivity.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/src/main/java/org/connectbot/ConsoleActivity.java b/app/src/main/java/org/connectbot/ConsoleActivity.java
index e7a8f7d..3a89c4c 100644
--- a/app/src/main/java/org/connectbot/ConsoleActivity.java
+++ b/app/src/main/java/org/connectbot/ConsoleActivity.java
@@ -500,7 +500,8 @@ public class ConsoleActivity extends Activity {
}
// activate consider if within x tolerance
- if (Math.abs(e1.getX() - e2.getX()) < ViewConfiguration.getTouchSlop() * 4) {
+ int touchSlop = ViewConfiguration.get(ConsoleActivity.this).getScaledTouchSlop();
+ if (Math.abs(e1.getX() - e2.getX()) < touchSlop * 4) {
View flip = findCurrentView(R.id.console_flip);
if (flip == null) return false;