Merge "Properly set input type on autofill compat mode." into pi-dev (be541db7) · Commits · e / os / android_frameworks_base

core/java/android/view/View.java

+17 −14

Original line number	Original line	Diff line number	Diff line
	@@ -8536,24 +8536,27 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
	}		}
	structure.setHint(info.getHintText());		structure.setHint(info.getHintText());
	}		}
	if ((info.getText() != null \|\| info.getError() != null)) {		CharSequence text = info.getText();
	structure.setText(info.getText(), info.getTextSelectionStart(),		boolean hasText = text != null \|\| info.getError() != null;
	info.getTextSelectionEnd());		if (hasText) {
			structure.setText(text, info.getTextSelectionStart(), info.getTextSelectionEnd());
			}
	if (forAutofill) {		if (forAutofill) {
	if (info.isEditable()) {		if (info.isEditable()) {
	structure.setDataIsSensitive(true);		structure.setDataIsSensitive(true);
			if (hasText) {
	structure.setAutofillType(AUTOFILL_TYPE_TEXT);		structure.setAutofillType(AUTOFILL_TYPE_TEXT);
	final AutofillValue autofillValue = AutofillValue.forText(structure.getText());		structure.setAutofillValue(AutofillValue.forText(text));
	structure.setAutofillValue(autofillValue);		}
	if (info.isPassword()) {		int inputType = info.getInputType();
	structure.setInputType(InputType.TYPE_CLASS_TEXT		if (inputType == 0 && info.isPassword()) {
	\| InputType.TYPE_TEXT_VARIATION_PASSWORD);		inputType = InputType.TYPE_CLASS_TEXT \| InputType.TYPE_TEXT_VARIATION_PASSWORD;
	}		}
			structure.setInputType(inputType);
	} else {		} else {
	structure.setDataIsSensitive(false);		structure.setDataIsSensitive(false);
	}		}
	}		}
	}
	final int NCHILDREN = info.getChildCount();		final int NCHILDREN = info.getChildCount();
	if (NCHILDREN > 0) {		if (NCHILDREN > 0) {
	structure.setChildCount(NCHILDREN);		structure.setChildCount(NCHILDREN);