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

Commit 6f232565 authored by Jason Monk's avatar Jason Monk Committed by android-build-merger
Browse files

Merge "Make QS light" into oc-dev am: 755138bb 

am: 5881209c

Change-Id: Ife0be0ed4dade96bb42a64c39d022e0b84517d91
parents 7218bdd5 5881209c

core/res/res/values/themes_device_defaults.xml

+5 −5
Original line number Diff line number Diff line
@@ -748,12 +748,12 @@ easier. 


    <!-- @hide DeviceDefault theme for a window that should use Settings theme colors

         but has a full dark palette. ONLY USED FOR QUICK SETTINGS THEME -->

    <style name="Theme.DeviceDefault.QuickSettings" parent="Theme.Material">

    <style name="Theme.DeviceDefault.QuickSettings" parent="Theme.DeviceDefault.Light">

        <!-- Color palette -->

        <item name="colorPrimary">@color/primary_device_default_settings</item>

        <item name="colorPrimaryDark">@color/primary_dark_device_default_settings</item>

        <item name="colorSecondary">@color/secondary_device_default_settings</item>

        <item name="colorAccent">@color/accent_device_default_dark</item>

        <item name="colorPrimary">@color/primary_device_default_settings_light</item>

        <item name="colorPrimaryDark">@color/primary_dark_device_default_settings_light</item>

        <item name="colorSecondary">@color/secondary_device_default_settings_light</item>

        <item name="colorAccent">@color/accent_device_default_light</item>

        <item name="colorControlNormal">?attr/textColorPrimary</item>

    </style>

packages/SettingsLib/src/com/android/settingslib/Utils.java

+5 −0
Original line number Diff line number Diff line
@@ -186,6 +186,11 @@ public class Utils { 
        TypedArray ta = context.obtainStyledAttributes(new int[]{attr});

        float alpha = ta.getFloat(0, 0);

        ta.recycle();

        return applyAlpha(alpha, inputColor);

    }



    @ColorInt

    public static int applyAlpha(float alpha, int inputColor) {

        alpha *= Color.alpha(inputColor);

        return Color.argb((int) (alpha), Color.red(inputColor), Color.green(inputColor),

                Color.blue(inputColor));

packages/SystemUI/res/drawable/qs_background_primary.xml

+1 −1
Original line number Diff line number Diff line
@@ -15,6 +15,6 @@ 
-->

<inset xmlns:android="http://schemas.android.com/apk/res/android">

    <shape>

        <solid android:color="?android:attr/colorPrimary"/>

        <solid android:color="?android:attr/colorPrimaryDark"/>

    </shape>

</inset>

packages/SystemUI/res/layout/qs_divider.xml

+1 −2
Original line number Diff line number Diff line
@@ -16,6 +16,5 @@ 
<View xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="1dp"

    android:layout_marginStart="16dp"

    android:layout_marginEnd="16dp"

    android:alpha=".12"

    android:background="?android:attr/colorForeground" />

packages/SystemUI/src/com/android/systemui/qs/QSPanel.java

+3 −1
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import android.widget.ImageView; 
import android.widget.LinearLayout;

import com.android.internal.logging.MetricsLogger;

import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.settingslib.Utils;

import com.android.systemui.Dependency;

import com.android.systemui.R;

import com.android.systemui.plugins.qs.DetailAdapter;
@@ -118,7 +119,8 @@ public class QSPanel extends LinearLayout implements Tunable, Callback { 


    protected void addDivider() {

        mDivider = LayoutInflater.from(mContext).inflate(R.layout.qs_divider, this, false);

        mDivider.setBackgroundColor(getColorForState(mContext, Tile.STATE_INACTIVE));

        mDivider.setBackgroundColor(Utils.applyAlpha(mDivider.getAlpha(),

                getColorForState(mContext, Tile.STATE_ACTIVE)));

        addView(mDivider);

    }