| commit | e0df1ae2d306be2b319f6384947faeaeeb310042 | [log] [tgz] |
|---|---|---|
| author | Aurimas Liutikas <aurimas@google.com> | Sat Sep 24 01:54:31 2016 +0000 |
| committer | Aurimas Liutikas <aurimas@google.com> | Sat Sep 24 01:54:31 2016 +0000 |
| tree | 53efaf0c9b490b8e61f62ae15b70a3b5ae863853 | |
| parent | def71dc0849a49f73f7a09de1e00d8ef4188f4b6 [diff] |
Revert "Set background on correct view" This change broke the build https://android-build.googleplex.com/builds/submitted/3300826/support_test_apks/latest/logs This reverts commit def71dc0849a49f73f7a09de1e00d8ef4188f4b6. Change-Id: I628376f0e37914380aef9f8cac006dc1f6ae4f86
diff --git a/design/src/android/support/design/widget/TextInputLayout.java b/design/src/android/support/design/widget/TextInputLayout.java index 40adf2d..2bbaace 100644 --- a/design/src/android/support/design/widget/TextInputLayout.java +++ b/design/src/android/support/design/widget/TextInputLayout.java
@@ -868,7 +868,7 @@ // as the background. This has the unfortunate side-effect of wiping out any // user set padding, but I'd hope that use of custom padding on an EditText // is limited. - ViewCompat.setBackground(mEditText, newBg); + ViewCompat.setBackground(mErrorView, newBg); mHasReconstructedEditTextBackground = true; } }
diff --git a/design/tests/src/android/support/design/widget/TextInputLayoutTest.java b/design/tests/src/android/support/design/widget/TextInputLayoutTest.java index 07c7488..fce619e 100755 --- a/design/tests/src/android/support/design/widget/TextInputLayoutTest.java +++ b/design/tests/src/android/support/design/widget/TextInputLayoutTest.java
@@ -216,18 +216,6 @@ onView(withId(R.id.textinput_edittext)).check(matches(not(isEnabled()))); } - /** - * Regression test for b/31663756. - */ - @Test - public void testDrawableStateChanged() { - final Activity activity = mActivityTestRule.getActivity(); - final TextInputLayout layout = activity.findViewById(R.id.textinput); - - // Force a drawable state change. - layout.drawableStateChanged(); - } - static ViewAssertion isHintExpanded(final boolean expanded) { return new ViewAssertion() { @Override