Merge "Read the autofill highlight from rootView context" into oc-dev

am: f51b5f991c

Change-Id: Ibaef62c34d3c966d104244ba3380864451c8cb6c
This commit is contained in:
Philip P. Moltmann
2017-05-08 23:17:08 +00:00
committed by android-build-merger

View File

@@ -20430,9 +20430,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
@Nullable private Drawable getAutofilledDrawable() {
// Lazily load the isAutofilled drawable.
if (mAttachInfo.mAutofilledDrawable == null) {
TypedArray a = mContext.getTheme().obtainStyledAttributes(AUTOFILL_HIGHLIGHT_ATTR);
Context rootContext = getRootView().getContext();
TypedArray a = rootContext.getTheme().obtainStyledAttributes(AUTOFILL_HIGHLIGHT_ATTR);
int attributeResourceId = a.getResourceId(0, 0);
mAttachInfo.mAutofilledDrawable = mContext.getDrawable(attributeResourceId);
mAttachInfo.mAutofilledDrawable = rootContext.getDrawable(attributeResourceId);
a.recycle();
}