From b72d619fe0da49e3b2e49b3386240dcddf5d08c5 Mon Sep 17 00:00:00 2001 From: Unpublished Date: Tue, 10 Jun 2014 00:20:47 +0200 Subject: [PATCH] QS: respect equalizer in switch to small tiles Change-Id: I2fa7f721c5a884bcfad49eb9e6a104ea89b019a5 --- .../systemui/quicksettings/EqualizerTile.java | 4 ++++ .../quicksettings/QuickSettingsTile.java | 20 +++++++++++++------ 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 a01c703c154db..0cac04f6a13fe 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 void onClick(View v) { }; } + @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 77d4578488464..7c7268365acdc 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 void setupQuickSettingsTile(LayoutInflater inflater, } 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 void switchToRibbonMode() { } 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 void switchToSmallIcons() { 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 void switchToSmallIcons() { } } + 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 void updateResources() { } 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 @@ void updateQuickSettings() { 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); }