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

am 8c44e745: Merge "Landscape extracted mode - floating toolbar interference" into mnc-dev

Browse Source 
* commit '8c44e74524a43ad7cb41b1641bb2dac75cf9c7e8':
  Landscape extracted mode - floating toolbar interference
This commit is contained in:
Andrei Stingaceanu
2015-05-20 09:51:47 +00:00
committed by Android Git Automerger
parent f9855b642c 8c44e74524
commit 886e9478f5
1 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1699,6 +1699,15 @@ public class Editor {
* @return true if the selection mode was actually started.
*/
private boolean startSelectionActionModeWithoutSelection() {
if (extractedTextModeWillBeStarted()) {
// Cancel the single tap delayed runnable.
if (mSelectionModeWithoutSelectionRunnable != null) {
mTextView.removeCallbacks(mSelectionModeWithoutSelectionRunnable);
}
return false;
}
if (mSelectionActionMode != null) {
// Selection action mode is already started
// TODO: revisit invocations to minimize this case.
@@ -1740,6 +1749,15 @@ public class Editor {
}
private boolean startSelectionActionModeWithSelectionInternal() {
if (extractedTextModeWillBeStarted()) {
// Cancel the single tap delayed runnable.
if (mSelectionModeWithoutSelectionRunnable != null) {
mTextView.removeCallbacks(mSelectionModeWithoutSelectionRunnable);
}
return false;
}
if (mSelectionActionMode != null) {
// Selection action mode is already started
mSelectionActionMode.invalidate();