From dfae41da7df60ab5b40c20bc7d741b099733ac65 Mon Sep 17 00:00:00 2001
From: Chris Banes <chrisbanes@google.com>
Date: Wed, 30 Nov 2016 01:35:57 +0000
Subject: [PATCH] am f1f9e992: am 08ce6ecd: Merge "Add
 AppCompatDrawableManager" into mnc-ub-dev

* commit 'f1f9e992e3d6c330d12b6b1afa13e87f8b5728d5':
  Add AppCompatDrawableManager

GitOrigin-RevId=b69b2623e94d82f3073379e3e4d5cd2968b68970

PiperOrigin-RevId: 140550505
---
 src/android/support/design/widget/TabLayout.java       | 7 ++++---
 src/android/support/design/widget/TextInputLayout.java | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/android/support/design/widget/TabLayout.java b/src/android/support/design/widget/TabLayout.java
index 2410a3270..89ca383bc 100755
--- a/src/android/support/design/widget/TabLayout.java
+++ b/src/android/support/design/widget/TabLayout.java
@@ -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);
diff --git a/src/android/support/design/widget/TextInputLayout.java b/src/android/support/design/widget/TextInputLayout.java
index 0d5f7baf6..b9319b558 100644
--- a/src/android/support/design/widget/TextInputLayout.java
+++ b/src/android/support/design/widget/TextInputLayout.java
@@ -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));
         }
     }