fix: remove dependency on TintManager

RowlandOti · Jul 22, 2016 · 0e66fa7 · 0e66fa7
1 parent 17413a4
commit 0e66fa7
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 14 deletions.
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/design/build.gradle b/design/build.gradle
@@ -34,7 +34,7 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:23.1.1'
-    compile 'com.android.support:support-v4:23.1.1'
-    compile 'com.android.support:design:23.1.1'
+    compile 'com.android.support:appcompat-v7:23.4.0'
+    compile 'com.android.support:support-v4:23.4.0'
+    compile 'com.android.support:design:23.4.0'
 }
diff --git a/design/src/main/java/android/support/design/widget/SlidingTabStripLayout.java b/design/src/main/java/android/support/design/widget/SlidingTabStripLayout.java
@@ -14,7 +14,6 @@
 import android.support.v4.view.ViewPager;
 import android.support.v4.view.ViewPager.OnPageChangeListener;
 import android.support.v7.widget.AppCompatTextView;
-import android.support.v7.widget.TintManager;
 import android.text.TextUtils;
 import android.text.TextUtils.TruncateAt;
 import android.util.AttributeSet;
@@ -831,7 +830,8 @@ public TabView(Context context, SlidingTabStripLayout.Tab tab) {
             super(context);
             this.mTab = tab;
             if (SlidingTabStripLayout.this.mTabBackgroundResId != 0) {
-                this.setBackgroundDrawable(TintManager.getDrawable(context, SlidingTabStripLayout.this.mTabBackgroundResId));
+                //this.setBackgroundDrawable(TintManager.getDrawable(context, SlidingTabStripLayout.this.mTabBackgroundResId));
+                this.setBackgroundResource(SlidingTabStripLayout.this.mTabBackgroundResId);
             }
 
             ViewCompat.setPaddingRelative(this, SlidingTabStripLayout.this.mTabPaddingStart, SlidingTabStripLayout.this.mTabPaddingTop, SlidingTabStripLayout.this.mTabPaddingEnd, SlidingTabStripLayout.this.mTabPaddingBottom);
@@ -1057,7 +1057,8 @@ public SlidingTabStripLayout.Tab setIcon(Drawable icon) {
         }
 
         public SlidingTabStripLayout.Tab setIcon(int resId) {
-            return this.setIcon(TintManager.getDrawable(this.mParent.getContext(), resId));
+            //return this.setIcon(TintManager.getDrawable(this.mParent.getContext(), resId));
+            return null;
         }
 
         public SlidingTabStripLayout.Tab setText(CharSequence text) {

diff --git a/sample/build.gradle b/sample/build.gradle
@@ -25,6 +25,6 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:23.1.1'
+    compile 'com.android.support:appcompat-v7:23.4.0'
     compile project(path: ':design')
 }