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

am c398adf8: Merge "Fix floating toolbar popping frequently after Replace/Copy" into mnc-dev

Browse Source 
* commit 'c398adf81c5167fc4b9b9cefd1550bc8fd4a54e6':
  Fix floating toolbar popping frequently after Replace/Copy
This commit is contained in:
Andrei Stingaceanu
2015-05-14 10:28:18 +00:00
committed by Android Git Automerger
parent cffd50a6a7 c398adf81c
commit dee1479c90
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3721,9 +3721,9 @@ public class Editor {
public void show() {
super.show();
final long durationSinceCutOrCopy =
SystemClock.uptimeMillis() - TextView.LAST_CUT_OR_COPY_TIME;
if (durationSinceCutOrCopy < RECENT_CUT_COPY_DURATION) {
final long durationSinceLastCutCopyOrTextChanged =
SystemClock.uptimeMillis() - TextView.sLastCutCopyOrTextChangedTime;
if (durationSinceLastCutCopyOrTextChanged < RECENT_CUT_COPY_DURATION) {
startSelectionActionModeWithoutSelection();
}

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

@@ -292,8 +292,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
// New state used to change background based on whether this TextView is multiline.
private static final int[] MULTILINE_STATE_SET = { R.attr.state_multiline };
// System wide time for last cut or copy action.
static long LAST_CUT_OR_COPY_TIME;
// System wide time for last cut, copy or text changed action.
static long sLastCutCopyOrTextChangedTime;
/**
* @hide
@@ -8005,6 +8005,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
* through a thunk.
*/
void sendAfterTextChanged(Editable text) {
sLastCutCopyOrTextChangedTime = 0;
if (mListeners != null) {
final ArrayList<TextWatcher> list = mListeners;
final int count = list.size();
@@ -9291,7 +9293,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
}
}
stopSelectionActionMode();
LAST_CUT_OR_COPY_TIME = 0;
sLastCutCopyOrTextChangedTime = 0;
}
}
@@ -9311,7 +9313,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
ClipboardManager clipboard = (ClipboardManager) getContext().
getSystemService(Context.CLIPBOARD_SERVICE);
clipboard.setPrimaryClip(clip);
LAST_CUT_OR_COPY_TIME = SystemClock.uptimeMillis();
sLastCutCopyOrTextChangedTime = SystemClock.uptimeMillis();
}
/**