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

Commit 149d63ab authored by Lucas Dupin's avatar Lucas Dupin Committed by Android (Google) Code Review
Browse files

Merge "Update privacy chip colors"

parents 708e2de4 b7307c61
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@
-->

<shape xmlns:android="http://schemas.android.com/apk/res/android">
    <solid android:color="#242424" /> <!-- 14% of white -->
    <solid android:color="?android:attr/colorAccent" />
    <padding android:paddingTop="@dimen/ongoing_appops_chip_bg_padding"
        android:paddingBottom="@dimen/ongoing_appops_chip_bg_padding" />
    <corners android:radius="@dimen/ongoing_appops_chip_bg_corner_radius" />
+5 −3
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.view.ViewGroup
import android.widget.FrameLayout
import android.widget.ImageView
import android.widget.LinearLayout
import com.android.settingslib.Utils
import com.android.systemui.R

class OngoingPrivacyChip @JvmOverloads constructor(
@@ -36,8 +37,9 @@ class OngoingPrivacyChip @JvmOverloads constructor(
                    R.dimen.ongoing_appops_chip_icon_margin_collapsed)
    private val iconSize =
            context.resources.getDimensionPixelSize(R.dimen.ongoing_appops_chip_icon_size)
    private val iconColor = context.resources.getColor(
            R.color.status_bar_clock_color, context.theme)
    private val iconColor = Utils.getColorAttrDefaultColor(context, android.R.attr.textColorPrimary)
    private val expandedIconColor = Utils
            .getColorAttrDefaultColor(context, android.R.attr.textColorPrimaryInverse)
    private val sidePadding =
            context.resources.getDimensionPixelSize(R.dimen.ongoing_appops_chip_side_padding)
    private val backgroundDrawable = context.getDrawable(R.drawable.privacy_chip_bg)
@@ -73,7 +75,7 @@ class OngoingPrivacyChip @JvmOverloads constructor(
            iconsContainer.removeAllViews()
            chipBuilder.generateIcons().forEachIndexed { i, it ->
                it.mutate()
                it.setTint(iconColor)
                it.setTint(if (expanded) expandedIconColor else iconColor)
                val image = ImageView(context).apply {
                    setImageDrawable(it)
                    scaleType = ImageView.ScaleType.CENTER_INSIDE