Merge "Ignore dispatchProvideStructureForAutofill() when layout is being updated." into oc-dev

am: e4835a2af4

Change-Id: If88ec9c1de2d81d5b629ed0ead8c9911e6f2c0c5
This commit is contained in:
Felipe Leme
2017-06-09 21:03:27 +00:00
committed by android-build-merger

View File

@@ -8063,6 +8063,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
boolean forAutofill, @AutofillFlags int flags) { boolean forAutofill, @AutofillFlags int flags) {
if (forAutofill) { if (forAutofill) {
structure.setAutofillId(getAutofillId()); structure.setAutofillId(getAutofillId());
if (!isLaidOut()) {
Log.w(VIEW_LOG_TAG, "dispatchProvideAutofillStructure(): not laid out, ignoring");
return;
}
onProvideAutofillStructure(structure, flags); onProvideAutofillStructure(structure, flags);
onProvideAutofillVirtualStructure(structure, flags); onProvideAutofillVirtualStructure(structure, flags);
} else if (!isAssistBlocked()) { } else if (!isAssistBlocked()) {