am 705a9abc: am 3d7109a1: Merge "EditText - can not drag handles in extracted mode" into mnc-dev

* commit '705a9abcd4e4c61e72821f3c5f58271f77d93882':
  EditText - can not drag handles in extracted mode
This commit is contained in:
Andrei Stingaceanu
2015-06-25 16:18:47 +00:00
committed by Android Git Automerger

View File

@@ -5230,7 +5230,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
// Phone specific code (there is no ExtractEditText on tablets).
// ExtractEditText does not call onFocus when it is displayed, and mHasSelectionOnFocus can
// not be set. Do the test here instead.
if (this instanceof ExtractEditText && hasSelection() && mEditor != null) {
if (isInExtractedMode() && hasSelection() && mEditor != null
&& mEditor.mTextActionMode == null) {
mEditor.startSelectionActionMode();
}