Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Show drag handles after finishing batch edit if needed." into nyc-dev am: be1cd9f5ce

Browse Source 
am: 5496ec1875

* commit '5496ec18757e5ad6e580a2ed687dda7cbee6cb53':
  Show drag handles after finishing batch edit if needed.

Change-Id: I166095155e17b1e57c92782a9af786596723d22d
This commit is contained in:
Keisuke Kuroyanagi
2016-05-04 00:35:27 +00:00
committed by android-build-merger
parent 5e603c6fa0 5496ec1875
commit 8615fdf80c
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/widget/Editor.java
View File

@@ -1465,6 +1465,16 @@ public class Editor {
// sendUpdateSelection knows to avoid sending if the selection did // sendUpdateSelection knows to avoid sending if the selection did
// not actually change. // not actually change.
sendUpdateSelection(); sendUpdateSelection();
// Show drag handles if they were blocked by batch edit mode.
if (mTextActionMode != null) {
final CursorController cursorController = mTextView.hasSelection() ?
getSelectionController() : getInsertionController();
if (cursorController != null && !cursorController.isActive()
&& !cursorController.isCursorBeingModified()) {
cursorController.show();
}
}
} }
static final int EXTRACT_NOTHING = -2; static final int EXTRACT_NOTHING = -2;