am ecc3c2a5: Merge "Show a cursor on long press" into ics-mr0 (80b6d1dd) · Commits · e / os / android_packages_apps_Contacts

src/com/android/contacts/dialpad/DialpadFragment.java

+14 −0

Original line number	Diff line number	Diff line
		@@ -248,6 +248,7 @@ public class DialpadFragment extends Fragment
		mDigits.setKeyListener(DialerKeyListener.getInstance());
		mDigits.setOnClickListener(this);
		mDigits.setOnKeyListener(this);
		mDigits.setOnLongClickListener(this);
		mDigits.addTextChangedListener(this);

		PhoneNumberFormatter.setPhoneNumberFormattingTextWatcher(getActivity(), mDigits);
		@@ -653,6 +654,12 @@ public class DialpadFragment extends Fragment
		mHaptic.vibrate();
		KeyEvent event = new KeyEvent(KeyEvent.ACTION_DOWN, keyCode);
		mDigits.onKeyDown(keyCode, event);

		// If the cursor is at the end of the text we hide it.
		final int length = mDigits.length();
		if (length == mDigits.getSelectionStart() && length == mDigits.getSelectionEnd()) {
		mDigits.setCursorVisible(false);
		}
		}

		public boolean onKey(View view, int keyCode, KeyEvent event) {
		@@ -804,6 +811,13 @@ public class DialpadFragment extends Fragment
		keyPressed(KeyEvent.KEYCODE_PLUS);
		return true;
		}
		case R.id.digits: {
		// Right now EditText does not show the "paste" option when cursor is not visible.
		// To show that, make the cursor visible, and return false, letting the EditText
		// show the option by itself.
		mDigits.setCursorVisible(true);
		return false;
		}
		}
		return false;
		}