diff options
author | Andrew Dolgov <[email protected]> | 2013-03-24 01:53:03 -0700 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2013-03-24 01:53:03 -0700 |
commit | cb39f9aa2599691ca7386a63ee2b1bef6dbf8b0a (patch) | |
tree | 449b593dffa937c1b63391c53d5427cef106d1df | |
parent | 2683ad89a65f29c7d1aa6a71524e98c063ba3f15 (diff) | |
parent | 879d82325cba0ea9318977ad86f8a53aab9b614a (diff) |
Merge pull request #12 from moneytoo/volumekeys
Added handling of volume keys in onKeyUp to suppress beeping
-rw-r--r-- | src/org/fox/ttrss/OnlineActivity.java | 15 | ||||
-rw-r--r-- | src/org/fox/ttrss/offline/OfflineActivity.java | 15 |
2 files changed, 30 insertions, 0 deletions
diff --git a/src/org/fox/ttrss/OnlineActivity.java b/src/org/fox/ttrss/OnlineActivity.java index ef94131b..3c52fdf9 100644 --- a/src/org/fox/ttrss/OnlineActivity.java +++ b/src/org/fox/ttrss/OnlineActivity.java @@ -1198,7 +1198,22 @@ public class OnlineActivity extends CommonActivity { return super.onKeyDown(keyCode, event);
}
+
+ // Handle onKeyUp too to suppress beep
+ @Override
+ public boolean onKeyUp(int keyCode, KeyEvent event) {
+ if (m_prefs.getBoolean("use_volume_keys", false)) {
+
+ switch (keyCode) {
+ case KeyEvent.KEYCODE_VOLUME_UP:
+ case KeyEvent.KEYCODE_VOLUME_DOWN:
+ return true;
+ }
+ }
+ return super.onKeyUp(keyCode, event);
+ }
+
@SuppressWarnings("unchecked")
public void catchupFeed(final Feed feed) {
Log.d(TAG, "catchupFeed=" + feed);
diff --git a/src/org/fox/ttrss/offline/OfflineActivity.java b/src/org/fox/ttrss/offline/OfflineActivity.java index 41122e0f..78102c1a 100644 --- a/src/org/fox/ttrss/offline/OfflineActivity.java +++ b/src/org/fox/ttrss/offline/OfflineActivity.java @@ -520,6 +520,21 @@ public class OfflineActivity extends CommonActivity { return super.onKeyDown(keyCode, event);
}
+ // Handle onKeyUp too to suppress beep
+ @Override
+ public boolean onKeyUp(int keyCode, KeyEvent event) {
+ if (m_prefs.getBoolean("use_volume_keys", false)) {
+
+ switch (keyCode) {
+ case KeyEvent.KEYCODE_VOLUME_UP:
+ case KeyEvent.KEYCODE_VOLUME_DOWN:
+ return true;
+ }
+ }
+
+ return super.onKeyUp(keyCode, event);
+ }
+
protected Cursor getFeedById(int feedId) {
Cursor c = getReadableDb().query("feeds", null,
BaseColumns._ID + "=?",
|