diff options
author | John Spurlock <jspurlock@google.com> | 2014-06-04 00:15:51 -0400 |
---|---|---|
committer | John Spurlock <jspurlock@google.com> | 2014-06-04 00:18:27 -0400 |
commit | ed33da173455add34d95d8a933bff8fc97f882fb (patch) | |
tree | 303df30bf9d598b686009309b699617c28be96af /packages | |
parent | 856edebad73560e9b1cce021a7de9a0470d07176 (diff) | |
download | frameworks_base-ed33da173455add34d95d8a933bff8fc97f882fb.zip frameworks_base-ed33da173455add34d95d8a933bff8fc97f882fb.tar.gz frameworks_base-ed33da173455add34d95d8a933bff8fc97f882fb.tar.bz2 |
QuickSettings: System accent color for seekbars.
Decouple system ui's seekbar's color from the platform
default.
Bug:15186962
Change-Id: I8e4f5605bf5f8be32b290e588d2d854e908f2387
Diffstat (limited to 'packages')
-rw-r--r-- | packages/SystemUI/res/layout/volume_panel_item.xml | 1 | ||||
-rw-r--r-- | packages/SystemUI/res/values/styles.xml | 6 | ||||
-rw-r--r-- | packages/SystemUI/src/com/android/systemui/qs/tiles/NotificationsTile.java | 4 |
3 files changed, 2 insertions, 9 deletions
diff --git a/packages/SystemUI/res/layout/volume_panel_item.xml b/packages/SystemUI/res/layout/volume_panel_item.xml index 4a2a0c0..6e5ab47 100644 --- a/packages/SystemUI/res/layout/volume_panel_item.xml +++ b/packages/SystemUI/res/layout/volume_panel_item.xml @@ -35,7 +35,6 @@ android:layout_height="wrap_content" android:layout_weight="1"> <SeekBar - style="?android:attr/seekBarStyle" android:id="@+id/seekbar" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml index 6a12232..4c269a2 100644 --- a/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml @@ -197,6 +197,7 @@ <style name="systemui_theme" parent="@android:style/Theme.DeviceDefault"> <item name="android:colorPrimary">@color/primary_color</item> + <item name="android:colorControlActivated">@color/system_accent_color</item> </style> <style name="NotificationsQuickSettings"> @@ -213,11 +214,6 @@ <item name="android:colorControlActivated">#ffffffff</item> </style> - <style name="QSAccentTheme" parent="@android:style/Theme.DeviceDefault"> - <item name="android:colorControlNormal">@color/system_accent_color</item> - <item name="android:colorControlActivated">@color/system_accent_color</item> - </style> - <style name="BorderlessButton" parent="@android:style/Widget.Quantum.Button.Borderless" /> <style name="BorderlessButton.Tiny"> diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/NotificationsTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/NotificationsTile.java index 20bbf8b..b981ed6 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/NotificationsTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/NotificationsTile.java @@ -22,7 +22,6 @@ import android.content.Intent; import android.content.IntentFilter; import android.media.AudioManager; import android.util.Log; -import android.view.ContextThemeWrapper; import android.view.LayoutInflater; import android.view.View; import android.view.View.OnAttachStateChangeListener; @@ -49,8 +48,7 @@ public class NotificationsTile extends QSTile<NotificationsTile.NotificationsSta @Override public View createDetailView(Context context, ViewGroup root) { - final Context themedContext = new ContextThemeWrapper(mContext, R.style.QSAccentTheme); - final View v = LayoutInflater.from(themedContext).inflate(R.layout.qs_detail, root, false); + final View v = LayoutInflater.from(context).inflate(R.layout.qs_detail, root, false); final TextView title = (TextView) v.findViewById(android.R.id.title); title.setText(R.string.quick_settings_notifications_label); final View close = v.findViewById(android.R.id.button1); |