DEV/material-components_material-components-android
1
0
Fork 0
mirror of https://github.com/material-components/material-components-android.git synced 2026-02-20 08:39:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

am f1f9e992: am 08ce6ecd: Merge "Add AppCompatDrawableManager" into mnc-ub-dev

Browse Source 
* commit 'f1f9e992e3d6c330d12b6b1afa13e87f8b5728d5':
  Add AppCompatDrawableManager

GitOrigin-RevId=b69b2623e94d82f3073379e3e4d5cd2968b68970

PiperOrigin-RevId: 140550505
This commit is contained in:
Chris Banes 2016-11-30 01:35:57 +00:00 committed by Travis Collins
parent b693c62b6e
commit dfae41da7d
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/android/support/design/widget/TabLayout.java
View File

@ -39,7 +39,7 @@ import android.support.v4.view.ViewCompat;
import android.support.v4.view.ViewPager;
import android.support.v4.widget.TextViewCompat;
import android.support.v7.app.ActionBar;
import android.support.v7.internal.widget.TintManager;
import android.support.v7.internal.widget.AppCompatDrawableManager;
import android.text.Layout;
import android.text.TextUtils;
import android.util.AttributeSet;
@ -1071,7 +1071,7 @@ public class TabLayout extends HorizontalScrollView {
*/
@NonNull
public Tab setIcon(@DrawableRes int resId) {
return setIcon(TintManager.getDrawable(mParent.getContext(), resId));
return setIcon(AppCompatDrawableManager.get().getDrawable(mParent.getContext(), resId));
}
/**
@ -1176,7 +1176,8 @@ public class TabLayout extends HorizontalScrollView {
super(context);
mTab = tab;
if (mTabBackgroundResId != 0) {
setBackgroundDrawable(TintManager.getDrawable(context, mTabBackgroundResId));
setBackgroundDrawable(
AppCompatDrawableManager.get().getDrawable(context, mTabBackgroundResId));
}
ViewCompat.setPaddingRelative(this, mTabPaddingStart, mTabPaddingTop,
mTabPaddingEnd, mTabPaddingBottom);

6
src/android/support/design/widget/TextInputLayout.java
View File

@ -32,7 +32,7 @@ import android.support.v4.view.GravityCompat;
import android.support.v4.view.ViewCompat;
import android.support.v4.view.ViewPropertyAnimatorListenerAdapter;
import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat;
import android.support.v7.internal.widget.TintManager;
import android.support.v7.internal.widget.AppCompatDrawableManager;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
@ -536,9 +536,9 @@ public class TextInputLayout extends LinearLayout {
ViewCompat.setBackgroundTintList(mEditText,
ColorStateList.valueOf(mCounterView.getCurrentTextColor()));
} else {
final TintManager tintManager = TintManager.get(getContext());
ViewCompat.setBackgroundTintList(mEditText,
tintManager.getTintList(R.drawable.abc_edit_text_material));
AppCompatDrawableManager.get()
.getTintList(getContext(), R.drawable.abc_edit_text_material));
}
}