Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

[Android] Do not collapse text selection on shift key up #42075

Merged
auto-submit merged 2 commits into from
May 17, 2023
Merged

[Android] Do not collapse text selection on shift key up #42075

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1241cdc
Do not collapse selection on shift key up
Renzo-Olivares May 16, 2023
a822e47
fix test
Renzo-Olivares May 16, 2023
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
7 changes: 0 additions & 7 deletions shell/platform/android/io/flutter/plugin/editing/InputConnectionAdaptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,13 +326,6 @@ public boolean handleKeyEvent(KeyEvent event) {
return true;
}
}
if (event.getAction() == KeyEvent.ACTION_UP
&& (event.getKeyCode() == KeyEvent.KEYCODE_SHIFT_LEFT
|| event.getKeyCode() == KeyEvent.KEYCODE_SHIFT_RIGHT)) {
int selEnd = Selection.getSelectionEnd(mEditable);
setSelection(selEnd, selEnd);
return true;
}
return false;
}

Expand Down
7 changes: 4 additions & 3 deletions shell/platform/android/test/io/flutter/plugin/editing/InputConnectionAdaptorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,7 +551,8 @@ public void testPerformPrivateCommand_dataIsFloatArray() throws JSONException {
}

@Test
public void testSendKeyEvent_shiftKeyUpCancelsSelection() {
public void testSendKeyEvent_shiftKeyUpDoesNotCancelSelection() {
// Regression test for https://github.com/flutter/flutter/issues/101569.
int selStart = 5;
int selEnd = 10;
ListenableEditingState editable = sampleEditable(selStart, selEnd);
Expand All @@ -560,8 +561,8 @@ public void testSendKeyEvent_shiftKeyUpCancelsSelection() {
KeyEvent shiftKeyUp = new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_SHIFT_LEFT);
boolean didConsume = adaptor.handleKeyEvent(shiftKeyUp);

assertTrue(didConsume);
assertEquals(selEnd, Selection.getSelectionStart(editable));
assertFalse(didConsume);
assertEquals(selStart, Selection.getSelectionStart(editable));
assertEquals(selEnd, Selection.getSelectionEnd(editable));
}

Expand Down