aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-06-05 23:19:56 +0200
committerDaniel Gultsch <daniel@gultsch.de>2016-06-05 23:19:56 +0200
commitb88128241eb7deb6599e946dc009fdc5dfd32974 (patch)
treee5af701f34b065d4d8837ff4ef304c9888605ec9 /src/main
parent9f42ead7479cf6dd989e7b9ca96306f5a896bcf3 (diff)
parent92bad0fa1ec6cf5fd46ce42a82b0093681d8d6b5 (diff)
Merge pull request #1895 from pp3345/right-alt
Do not treat Right Alt key as a modifier for key combos
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/ConversationActivity.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
index a9b9beb7..2717aa3d 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
@@ -949,7 +949,7 @@ public class ConversationActivity extends XmppActivity
upKey = KeyEvent.KEYCODE_DPAD_UP;
downKey = KeyEvent.KEYCODE_DPAD_DOWN;
}
- final boolean modifier = event.isCtrlPressed() || event.isAltPressed();
+ final boolean modifier = event.isCtrlPressed() || (event.getMetaState() & KeyEvent.META_ALT_LEFT_ON) != 0;
if (modifier && key == KeyEvent.KEYCODE_TAB && isConversationsOverviewHideable()) {
toggleConversationsOverview();
return true;