Mercurial > 510Connectbot

comparison src/com/five_ten_sg/connectbot/ConsoleActivity.java @ 419:9045b1af94e5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revert notifyUser() changes
author Carl Byington <carl@five-ten-sg.com>
date Wed, 29 Oct 2014 15:25:32 -0700
parents 07c1da90deab
children
comparison
equal deleted inserted replaced
418:39533be5cbe9 419:9045b1af94e5
762 && Math.abs(event.getX() - lastX) < MAX_CLICK_DISTANCE 762 && Math.abs(event.getX() - lastX) < MAX_CLICK_DISTANCE
763 && Math.abs(event.getY() - lastY) < MAX_CLICK_DISTANCE) { 763 && Math.abs(event.getY() - lastY) < MAX_CLICK_DISTANCE) {
764 showEmulatedKeys(); 764 showEmulatedKeys();
765 } 765 }
766 766
767 // pass any touch events back to detector 767 // pass any touch events back to BOTH detectors
768 TerminalView terminalView = (TerminalView) findCurrentView(R.id.console_flip); 768 TerminalView terminalView = (TerminalView) findCurrentView(R.id.console_flip);
769 if ((terminalView != null) && terminalView.mScaleDetector.onTouchEvent(event)) return true; 769 boolean rc = false;
770 return gestDetect.onTouchEvent(event); 770 if ((terminalView != null) && terminalView.mScaleDetector.onTouchEvent(event)) rc = true;
771 if (gestDetect.onTouchEvent(event)) rc = true;
772 return rc;
771 } 773 }
772 }); 774 });
773 } 775 }
774 776
775 /** 777 /**