From b45f6676f7c1661823cae2ba34e456a45ee4379b Mon Sep 17 00:00:00 2001 From: alescdb Date: Tue, 25 Aug 2015 23:58:37 +0200 Subject: Reset virtual keyboard auto-hide timer on hscroll --- .../main/java/org/connectbot/ConsoleActivity.java | 25 ++++++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) (limited to 'app/src/main/java/org/connectbot/ConsoleActivity.java') diff --git a/app/src/main/java/org/connectbot/ConsoleActivity.java b/app/src/main/java/org/connectbot/ConsoleActivity.java index 0e23979..61d7ce8 100644 --- a/app/src/main/java/org/connectbot/ConsoleActivity.java +++ b/app/src/main/java/org/connectbot/ConsoleActivity.java @@ -260,11 +260,11 @@ public class ConsoleActivity extends AppCompatActivity implements BridgeDisconne return (true); case MotionEvent.ACTION_CANCEL: - keyRepeatHandler.removeCallbacks(this); + mHandler.removeCallbacks(this); return (true); case MotionEvent.ACTION_UP: - keyRepeatHandler.removeCallbacks(this); + mHandler.removeCallbacks(this); if (!mDown) { onEmulatedKeyClicked(mView); } @@ -402,10 +402,12 @@ public class ConsoleActivity extends AppCompatActivity implements BridgeDisconne booleanPromptGroup.setVisibility(View.GONE); } - private void showEmulatedKeys() { + private void showEmulatedKeys(boolean showActionBar) { keyboardGroup.startAnimation(keyboard_fade_in); keyboardGroup.setVisibility(View.VISIBLE); - actionBar.show(); + if (showActionBar) { + actionBar.show(); + } autoHideEmulatedKeys(); } @@ -596,10 +598,10 @@ public class ConsoleActivity extends AppCompatActivity implements BridgeDisconne } }); + final HorizontalScrollView keyboardScroll = (HorizontalScrollView) findViewById(R.id.keyboard_hscroll); if (!hardKeyboard) { // Show virtual keyboard and scroll back and forth - final HorizontalScrollView keyboardScroll = (HorizontalScrollView) findViewById(R.id.keyboard_hscroll); - showEmulatedKeys(); + showEmulatedKeys(false); keyboardScroll.postDelayed(new Runnable() { @Override public void run() { @@ -620,6 +622,15 @@ public class ConsoleActivity extends AppCompatActivity implements BridgeDisconne } }, 1000); } + keyboardScroll.setOnTouchListener( + new OnTouchListener() { + public boolean onTouch(View v, MotionEvent event) { + if (event.getAction() == MotionEvent.ACTION_MOVE) { + autoHideEmulatedKeys(); + } + return (false); + } + }); tabs = (TabLayout) findViewById(R.id.tabs); if (tabs != null) @@ -788,7 +799,7 @@ public class ConsoleActivity extends AppCompatActivity implements BridgeDisconne && event.getEventTime() - event.getDownTime() < CLICK_TIME && Math.abs(event.getX() - lastX) < MAX_CLICK_DISTANCE && Math.abs(event.getY() - lastY) < MAX_CLICK_DISTANCE) { - showEmulatedKeys(); + showEmulatedKeys(true); } // pass any touch events back to detector -- cgit v1.2.3 From 12aec038e3961db1d650f02e6d6b10a6115b6480 Mon Sep 17 00:00:00 2001 From: alescdb Date: Wed, 26 Aug 2015 00:04:00 +0200 Subject: Comments --- app/src/main/java/org/connectbot/ConsoleActivity.java | 2 ++ 1 file changed, 2 insertions(+) (limited to 'app/src/main/java/org/connectbot/ConsoleActivity.java') diff --git a/app/src/main/java/org/connectbot/ConsoleActivity.java b/app/src/main/java/org/connectbot/ConsoleActivity.java index 61d7ce8..f0a6427 100644 --- a/app/src/main/java/org/connectbot/ConsoleActivity.java +++ b/app/src/main/java/org/connectbot/ConsoleActivity.java @@ -622,6 +622,8 @@ public class ConsoleActivity extends AppCompatActivity implements BridgeDisconne } }, 1000); } + + // Reset keyboard autohide timer when scrolling hscroll keyboardScroll.setOnTouchListener( new OnTouchListener() { public boolean onTouch(View v, MotionEvent event) { -- cgit v1.2.3 From b9d68fc455c31e02be91a2b453a866a4ea8af850 Mon Sep 17 00:00:00 2001 From: alescdb Date: Wed, 26 Aug 2015 00:24:51 +0200 Subject: Resolve lint issue --- app/src/main/java/org/connectbot/ConsoleActivity.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'app/src/main/java/org/connectbot/ConsoleActivity.java') diff --git a/app/src/main/java/org/connectbot/ConsoleActivity.java b/app/src/main/java/org/connectbot/ConsoleActivity.java index f0a6427..86b18cc 100644 --- a/app/src/main/java/org/connectbot/ConsoleActivity.java +++ b/app/src/main/java/org/connectbot/ConsoleActivity.java @@ -618,17 +618,22 @@ public class ConsoleActivity extends AppCompatActivity implements BridgeDisconne } keyboardScroll.smoothScrollBy(-xscroll, 0); } - }, 1000); + }, 500); } - }, 1000); + }, 500); } - // Reset keyboard autohide timer when scrolling hscroll + // Reset keyboard auto-hide timer when scrolling keyboardScroll.setOnTouchListener( new OnTouchListener() { public boolean onTouch(View v, MotionEvent event) { - if (event.getAction() == MotionEvent.ACTION_MOVE) { + switch (event.getAction()) { + case MotionEvent.ACTION_MOVE: autoHideEmulatedKeys(); + break; + case MotionEvent.ACTION_UP: + v.performClick(); + break; } return (false); } -- cgit v1.2.3 From 6f2efee2c48907a50d88dfe31b80392aa60eb5bf Mon Sep 17 00:00:00 2001 From: alescdb Date: Wed, 26 Aug 2015 09:45:14 +0200 Subject: onTouch() ACTION_UP, return(false) --- app/src/main/java/org/connectbot/ConsoleActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/src/main/java/org/connectbot/ConsoleActivity.java') diff --git a/app/src/main/java/org/connectbot/ConsoleActivity.java b/app/src/main/java/org/connectbot/ConsoleActivity.java index 86b18cc..0e7a693 100644 --- a/app/src/main/java/org/connectbot/ConsoleActivity.java +++ b/app/src/main/java/org/connectbot/ConsoleActivity.java @@ -633,7 +633,7 @@ public class ConsoleActivity extends AppCompatActivity implements BridgeDisconne break; case MotionEvent.ACTION_UP: v.performClick(); - break; + return (true); } return (false); } -- cgit v1.2.3