diff options
| author | 2014-07-10 23:06:10 +0000 | |
|---|---|---|
| committer | 2014-07-10 21:21:20 +0000 | |
| commit | 980f9925bb044bc87c1de1f0e21372f46d7d596d (patch) | |
| tree | 91c6c662a5842589a0988b64c3f1d33feb82c747 | |
| parent | 4fc1d105fc279bf7df6c876e160672866bdad8e7 (diff) | |
| parent | f7d22132c2c9b83134b05aaed63a89f61c639fd9 (diff) | |
Merge "Volume: Use accent color for selected radio button."
| -rw-r--r-- | packages/SystemUI/res/values/styles.xml | 5 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml index 1053288eb8ce..f99b68b22f05 100644 --- a/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml @@ -254,11 +254,6 @@ <item name="android:layout_width">match_parent</item> </style> - <style name="QSWhiteTheme" parent="@android:style/Theme.DeviceDefault"> - <item name="android:colorControlNormal">#ffffffff</item> - <item name="android:colorControlActivated">#ffffffff</item> - </style> - <style name="QSBorderlessButton"> <item name="android:padding">12dp</item> <item name="android:background">@drawable/btn_borderless_rect</item> diff --git a/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java b/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java index 3614cde83d7f..9bc00a95005f 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java +++ b/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java @@ -99,7 +99,7 @@ public class ZenModePanel extends LinearLayout { super(context, attrs); mContext = context; mFavorites = new Favorites(); - mInflater = LayoutInflater.from(new ContextThemeWrapper(context, R.style.QSWhiteTheme)); + mInflater = LayoutInflater.from(mContext.getApplicationContext()); mFastOutSlowInInterpolator = AnimationUtils.loadInterpolator(mContext, android.R.interpolator.fast_out_slow_in); updateTag(); |