Mercurial > 510Connectbot
diff src/com/five_ten_sg/connectbot/ConsoleActivity.java @ 419:9045b1af94e5
revert notifyUser() changes
author | Carl Byington <carl@five-ten-sg.com> |
---|---|
date | Wed, 29 Oct 2014 15:25:32 -0700 |
parents | 07c1da90deab |
children |
line wrap: on
line diff
--- a/src/com/five_ten_sg/connectbot/ConsoleActivity.java Wed Oct 29 13:28:59 2014 -0700 +++ b/src/com/five_ten_sg/connectbot/ConsoleActivity.java Wed Oct 29 15:25:32 2014 -0700 @@ -764,10 +764,12 @@ showEmulatedKeys(); } - // pass any touch events back to detector + // pass any touch events back to BOTH detectors TerminalView terminalView = (TerminalView) findCurrentView(R.id.console_flip); - if ((terminalView != null) && terminalView.mScaleDetector.onTouchEvent(event)) return true; - return gestDetect.onTouchEvent(event); + boolean rc = false; + if ((terminalView != null) && terminalView.mScaleDetector.onTouchEvent(event)) rc = true; + if (gestDetect.onTouchEvent(event)) rc = true; + return rc; } }); }