Skip to content
This repository was archived by the owner on Jul 22, 2024. It is now read-only.

Fixes #2568 Fix issue with shift and multi tapping #2636

Merged
bluemarvin merged 2 commits into from
Jan 29, 2020
Merged

Fixes #2568 Fix issue with shift and multi tapping #2636

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fbaa968
Fix issue with shift and multi tapping
keianhzo Jan 14, 2020
ad114b4
Improved multitap timeout and keyboard update
keianhzo Jan 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions app/src/common/shared/org/mozilla/vrbrowser/ui/views/CustomKeyboardView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ public interface OnKeyboardActionListener {
private int mTapCount;
private long mLastTapTime;
private boolean mInMultiTap;
private static final int MULTITAP_INTERVAL = 800; // milliseconds
private static final int MULTITAP_INTERVAL = 250; // milliseconds
private StringBuilder mPreviewLabel = new StringBuilder(1);

/** Whether the keyboard bitmap needs to be redrawn before it's blitted. **/
Expand Down Expand Up @@ -547,11 +547,10 @@ public Keyboard getKeyboard() {
*/
public boolean setShifted(boolean shifted) {
if (mKeyboard != null) {
if (mKeyboard.setShifted(shifted)) {
// The whole keyboard probably needs to be redrawn
invalidateAllKeys();
return true;
}
mKeyboard.setShifted(shifted);
// The whole keyboard probably needs to be redrawn
invalidateAllKeys();
return true;
}
return false;
}
Expand Down Expand Up @@ -1519,7 +1518,10 @@ private void checkMultiTap(long eventTime, int keyIndex) {
}

} else if (key.codes[0] == CustomKeyboard.KEYCODE_SHIFT) {
mInMultiTap = true;
if (eventTime < mLastTapTime + MULTITAP_INTERVAL
&& keyIndex == mLastSentIndex) {
mInMultiTap = true;
}
}

if (eventTime > mLastTapTime + MULTITAP_INTERVAL || keyIndex != mLastSentIndex) {
Expand Down