diff options
| author | Jeremy Klein <jlklein@google.com> | 2015-09-25 15:34:44 -0700 |
|---|---|---|
| committer | Jeremy Klein <jlklein@google.com> | 2015-10-01 14:56:39 -0700 |
| commit | aa2f25d977eb60c40bb05978a1e9826cd45b5552 (patch) | |
| tree | 5c17600e747ee5f7d7f8916f27a8e01f82d9ea8d /app/src/main/java | |
| parent | e4e3047bd5e9c8e010041aec196a77797e420332 (diff) | |
| download | connectbot-aa2f25d977eb60c40bb05978a1e9826cd45b5552.tar.gz connectbot-aa2f25d977eb60c40bb05978a1e9826cd45b5552.tar.bz2 connectbot-aa2f25d977eb60c40bb05978a1e9826cd45b5552.zip | |
Lint fix
Diffstat (limited to 'app/src/main/java')
| -rw-r--r-- | app/src/main/java/org/connectbot/ConsoleActivity.java | 6 | ||||
| -rw-r--r-- | app/src/main/java/org/connectbot/TerminalView.java | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/app/src/main/java/org/connectbot/ConsoleActivity.java b/app/src/main/java/org/connectbot/ConsoleActivity.java index 5a73fd6..0ee6a5a 100644 --- a/app/src/main/java/org/connectbot/ConsoleActivity.java +++ b/app/src/main/java/org/connectbot/ConsoleActivity.java @@ -756,7 +756,7 @@ public class ConsoleActivity extends AppCompatActivity implements BridgeDisconne boolean mouseReport = ((vt320) bridge.buffer).isMouseReportEnabled(); // MouseReport can be "defeated" using the shift key. - if ((!mouseReport || shiftOn) && event.getAction() == MotionEvent.ACTION_DOWN){ + if ((!mouseReport || shiftOn) && event.getAction() == MotionEvent.ACTION_DOWN) { switch (event.getButtonState()) { case MotionEvent.BUTTON_PRIMARY: // Automatically start copy mode if using a mouse. @@ -770,10 +770,10 @@ public class ConsoleActivity extends AppCompatActivity implements BridgeDisconne pasteIntoTerminal(); return true; } - } else if (event.getAction() == MotionEvent.ACTION_DOWN){ + } else if (event.getAction() == MotionEvent.ACTION_DOWN) { ((vt320) bridge.buffer).mousePressed( col, row, mouseEventToJavaModifiers(event)); - } else if (event.getAction() == MotionEvent.ACTION_UP){ + } else if (event.getAction() == MotionEvent.ACTION_UP) { ((vt320) bridge.buffer).mouseReleased(col, row); } } diff --git a/app/src/main/java/org/connectbot/TerminalView.java b/app/src/main/java/org/connectbot/TerminalView.java index ffe8d8b..e5a9558 100644 --- a/app/src/main/java/org/connectbot/TerminalView.java +++ b/app/src/main/java/org/connectbot/TerminalView.java @@ -26,6 +26,7 @@ import org.connectbot.service.FontSizeChangedListener; import org.connectbot.service.TerminalBridge; import org.connectbot.service.TerminalKeyListener; +import android.annotation.TargetApi; import android.content.ContentResolver; import android.content.Context; import android.content.Intent; @@ -39,6 +40,7 @@ import android.graphics.PixelXorXfermode; import android.graphics.RectF; import android.net.Uri; import android.os.AsyncTask; +import android.os.Build; import android.support.v4.view.MotionEventCompat; import android.view.InputDevice; import android.view.KeyEvent; @@ -324,7 +326,10 @@ public class TerminalView extends View implements FontSizeChangedListener { } @Override + @TargetApi(12) public boolean onGenericMotionEvent(MotionEvent event) { + if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.HONEYCOMB) return false; + if ((MotionEventCompat.getSource(event) & InputDevice.SOURCE_CLASS_POINTER) != 0) { switch (event.getAction()) { case MotionEvent.ACTION_SCROLL: |