QS: respect equalizer in switch to small tilescm-11.0-XNPH25R-bacon-d22b777afa

Change-Id: I2fa7f721c5a884bcfad49eb9e6a104ea89b019a5

2 files changed, 18 insertions, 6 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/quicksettings/EqualizerTile.java b/packages/SystemUI/src/com/android/systemui/quicksettings/EqualizerTile.java
index a01c703c154..0cac04f6a13 100644
--- a/packages/SystemUI/src/com/android/systemui/quicksettings/EqualizerTile.java
+++ b/packages/SystemUI/src/com/android/systemui/quicksettings/EqualizerTile.java
@@ -142,6 +142,10 @@ public class EqualizerTile extends QuickSettingsTile {
         };
     }
 
+    @Override
+    protected View getImageView() {
+        return mTile.findViewById(R.id.visualizer_view);
+    }
 
     @Override
     void onPostCreate() {
diff --git a/packages/SystemUI/src/com/android/systemui/quicksettings/QuickSettingsTile.java b/packages/SystemUI/src/com/android/systemui/quicksettings/QuickSettingsTile.java
index 77d45784884..7c7268365ac 100644
--- a/packages/SystemUI/src/com/android/systemui/quicksettings/QuickSettingsTile.java
+++ b/packages/SystemUI/src/com/android/systemui/quicksettings/QuickSettingsTile.java
@@ -72,11 +72,11 @@ public class QuickSettingsTile implements OnClickListener {
     }
 
     public void switchToRibbonMode() {
-        TextView tv = (TextView) mTile.findViewById(R.id.text);
+        TextView tv = getLabelView();
         if (tv != null) {
             tv.setVisibility(View.GONE);
         }
-        View image = mTile.findViewById(R.id.image);
+        View image = getImageView();
         if (image != null) {
             MarginLayoutParams params = (MarginLayoutParams) image.getLayoutParams();
             int margin = mContext.getResources().getDimensionPixelSize(
@@ -87,7 +87,7 @@ public class QuickSettingsTile implements OnClickListener {
     }
 
     public void switchToSmallIcons() {
-        TextView tv = (TextView) mTile.findViewById(R.id.text);
+        TextView tv = getLabelView();
         if (tv != null) {
             tv.setText(mLabel);
             tv.setTextSize(mTileTextSize);
@@ -96,7 +96,7 @@ public class QuickSettingsTile implements OnClickListener {
                 tv.setPadding(0, mTileTextPadding, 0, 0);
             }
         }
-        View image = mTile.findViewById(R.id.image);
+        View image = getImageView();
         if (image != null) {
             MarginLayoutParams params = (MarginLayoutParams) image.getLayoutParams();
             int margin = mContext.getResources().getDimensionPixelSize(
@@ -106,6 +106,14 @@ public class QuickSettingsTile implements OnClickListener {
         }
     }
 
+    protected View getImageView() {
+        return mTile.findViewById(R.id.image);
+    }
+
+    protected TextView getLabelView() {
+        return (TextView) mTile.findViewById(R.id.text);
+    }
+
     void onPostCreate() {}
 
     public void onDestroy() {}
@@ -121,7 +129,7 @@ public class QuickSettingsTile implements OnClickListener {
     }
 
     void updateQuickSettings() {
-        TextView tv = (TextView) mTile.findViewById(R.id.text);
+        TextView tv = getLabelView();
         if (tv != null) {
             tv.setText(mLabel);
             tv.setTextSize(mTileTextSize);
@@ -130,7 +138,7 @@ public class QuickSettingsTile implements OnClickListener {
                 tv.setPadding(0, mTileTextPadding, 0, 0);
             }
         }
-        View image = mTile.findViewById(R.id.image);
+        View image = getImageView();
         if (image != null && image instanceof ImageView) {
             ((ImageView) image).setImageResource(mDrawable);
         }