am 4d3baaf5: Merge "Bug fixes in Text selection." into gingerbread (115b9dc3) · Commits · e / os / android_frameworks_base

core/java/android/widget/TextView.java

+11 −26

Original line number	Diff line number	Diff line
		@@ -63,7 +63,6 @@ import android.text.StaticLayout;
		import android.text.TextPaint;
		import android.text.TextUtils;
		import android.text.TextWatcher;
		import android.text.method.ArrowKeyMovementMethod;
		import android.text.method.DateKeyListener;
		import android.text.method.DateTimeKeyListener;
		import android.text.method.DialerKeyListener;
		@@ -92,7 +91,6 @@ import android.view.LayoutInflater;
		import android.view.MenuItem;
		import android.view.MotionEvent;
		import android.view.View;
		import android.view.ViewConfiguration;
		import android.view.ViewDebug;
		import android.view.ViewGroup.LayoutParams;
		import android.view.ViewRoot;
		@@ -1155,7 +1153,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener

		fixFocusableAndClickableSettings();

		// SelectionModifierCursorController depends on canSelectText, which depends on mMovement
		// SelectionModifierCursorController depends on textCanBeSelected, which depends on mMovement
		prepareCursorControllers();
		}

		@@ -2725,7 +2723,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		sendAfterTextChanged((Editable) text);
		}

		// SelectionModifierCursorController depends on canSelectText, which depends on text
		// SelectionModifierCursorController depends on textCanBeSelected, which depends on text
		prepareCursorControllers();
		}

		@@ -6609,6 +6607,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		} else {
		terminateTextSelectionMode();
		}

		mLastTouchOffset = -1;
		}

		startStopMarquee(focused);
		@@ -6841,7 +6841,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		mInsertionPointCursorController = null;
		}

		if (canSelectText() && mLayout != null) {
		if (textCanBeSelected() && mLayout != null) {
		if (mSelectionModifierCursorController == null) {
		mSelectionModifierCursorController = new SelectionModifierCursorController();
		}
		@@ -7059,7 +7059,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		public boolean onKeyShortcut(int keyCode, KeyEvent event) {
		switch (keyCode) {
		case KeyEvent.KEYCODE_A:
		if (canSelectAll()) {
		if (canSelectText()) {
		return onTextContextMenuItem(ID_SELECT_ALL);
		}

		@@ -7090,11 +7090,11 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		return super.onKeyShortcut(keyCode, event);
		}

		private boolean canSelectAll() {
		return canSelectText() && mText.length() != 0;
		private boolean canSelectText() {
		return textCanBeSelected() && mText.length() != 0;
		}

		private boolean canSelectText() {
		private boolean textCanBeSelected() {
		// prepareCursorController() relies on this method.
		// If you change this condition, make sure prepareCursorController is called anywhere
		// the value of this condition might be changed.
		@@ -7403,10 +7403,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		if (canSelectText()) {
		menu.add(0, ID_START_SELECTING_TEXT, 0, com.android.internal.R.string.selectText).
		setOnMenuItemClickListener(handler);
		added = true;
		}

		if (canSelectAll()) {
		menu.add(0, ID_SELECT_ALL, 0, com.android.internal.R.string.selectAll).
		setOnMenuItemClickListener(handler).
		setAlphabeticShortcut('a');
		@@ -7429,8 +7425,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		}
		}

		// Paste location is too imprecise. Only allow on empty text fields.
		if (canPaste() && textIsOnlySpaces()) {
		if (canPaste()) {
		menu.add(0, ID_PASTE, 0, com.android.internal.R.string.paste).
		setOnMenuItemClickListener(handler).
		setAlphabeticShortcut('v');
		@@ -7458,16 +7453,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		}
		}

		private boolean textIsOnlySpaces() {
		final int length = mTransformed.length();
		for (int i = 0; i < length; i++) {
		if (!Character.isSpaceChar(mTransformed.charAt(i))) {
		return false;
		}
		}
		return true;
		}

		/**
		* Returns whether this text view is a current input method target. The
		* default implementation just checks with {@link InputMethodManager}.