Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 733ae473 authored by John Spurlock's avatar John Spurlock Committed by Android Git Automerger
Browse files

am b0570a49: Merge "QuickSettings: System accent color for seekbars." into lmp-preview-dev 

* commit 'b0570a49353d696da69d3bb19216190613075981':
  QuickSettings: System accent color for seekbars.
parents 7820b7bf 775f7d85

packages/SystemUI/res/layout/volume_panel_item.xml

+0 −1
Original line number Diff line number Diff line
@@ -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"

packages/SystemUI/res/values/styles.xml

+1 −5
Original line number Diff line number Diff line
@@ -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">

packages/SystemUI/src/com/android/systemui/qs/tiles/NotificationsTile.java

+1 −3
Original line number Diff line number Diff line
@@ -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);