am 4790259c: am 8de2cf4c: merge from open-source master (9bab8f11) · Commits · e / os / android_frameworks_base

core/java/android/text/method/PasswordTransformationMethod.java

+11 −8

Original line number	Diff line number	Diff line
		@@ -51,6 +51,8 @@ implements TransformationMethod, TextWatcher
		sp.removeSpan(vr[i]);
		}

		removeVisibleSpans(sp);

		sp.setSpan(new ViewReference(view), 0, 0,
		Spannable.SPAN_POINT_POINT);
		}
		@@ -100,10 +102,7 @@ implements TransformationMethod, TextWatcher
		int pref = TextKeyListener.getInstance().getPrefs(v.getContext());
		if ((pref & TextKeyListener.SHOW_PASSWORD) != 0) {
		if (count > 0) {
		Visible[] old = sp.getSpans(0, sp.length(), Visible.class);
		for (int i = 0; i < old.length; i++) {
		sp.removeSpan(old[i]);
		}
		removeVisibleSpans(sp);

		if (count == 1) {
		sp.setSpan(new Visible(sp, this), start, start + count,
		@@ -125,13 +124,17 @@ implements TransformationMethod, TextWatcher
		if (sourceText instanceof Spannable) {
		Spannable sp = (Spannable) sourceText;

		removeVisibleSpans(sp);
		}
		}
		}

		private static void removeVisibleSpans(Spannable sp) {
		Visible[] old = sp.getSpans(0, sp.length(), Visible.class);
		for (int i = 0; i < old.length; i++) {
		sp.removeSpan(old[i]);
		}
		}
		}
		}

		private static class PasswordCharSequence
		implements CharSequence, GetChars

+2 −1

Original line number	Diff line number	Diff line
		@@ -181,3 +181,4 @@ JNIEXPORT void JNICALL Java_com_android_gljni_GLJNILib_changeBackground(JNIEnv *
		{
		background = 1.0f - background;
		}