Mastodon
/
pachli-android
mirror of https://github.com/pachli/pachli-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(MainActivity,ComposeActivity): use onKeyDown() instead

This commit is contained in:
Gyuhwan Park 2019-05-31 17:34:53 +09:00
parent d31aa7fc43
commit 50b50a182e
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
View File

@ -540,7 +540,7 @@ public final class ComposeActivity
} }
}); });
textEditor.setOnKeyListener((view, keyCode, event) -> this.onKeyShortcut(keyCode, event)); textEditor.setOnKeyListener((view, keyCode, event) -> this.onKeyDown(keyCode, event));
textEditor.setAdapter( textEditor.setAdapter(
new ComposeAutoCompleteAdapter(this)); new ComposeAutoCompleteAdapter(this));
@ -1645,7 +1645,7 @@ public final class ComposeActivity
@Override @Override
public boolean onKeyShortcut(int keyCode, KeyEvent event) { public boolean onKeyDown(int keyCode, KeyEvent event) {
Log.d(TAG, event.toString()); Log.d(TAG, event.toString());
if (event.isCtrlPressed()) { if (event.isCtrlPressed()) {
if (keyCode == KeyEvent.KEYCODE_ENTER) { if (keyCode == KeyEvent.KEYCODE_ENTER) {

8
app/src/main/java/com/keylesspalace/tusky/MainActivity.java
View File

@ -281,11 +281,6 @@ public final class MainActivity extends BottomSheetActivity implements ActionBut
} }
} }
return super.onKeyDown(keyCode, event);
}
@Override
public boolean onKeyShortcut(int keyCode, KeyEvent event) {
if (event.isCtrlPressed() || event.isShiftPressed()) { if (event.isCtrlPressed() || event.isShiftPressed()) {
// FIXME: blackberry keyONE raises SHIFT key event even CTRL IS PRESSED // FIXME: blackberry keyONE raises SHIFT key event even CTRL IS PRESSED
switch (keyCode) { switch (keyCode) {
@ -297,7 +292,8 @@ public final class MainActivity extends BottomSheetActivity implements ActionBut
} }
} }
} }
return super.onKeyShortcut(keyCode, event);
return super.onKeyDown(keyCode, event);
} }
@Override @Override