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

Commit 69a4f451 authored by Matt Pietal's avatar Matt Pietal Committed by Automerger Merge Worker
Browse files

Merge "Controls UI - Fix routine icons" into rvc-dev am: f77d4b3d am: 8569d185 

Change-Id: I3b4d87c0ad57e47c236ecd50db9258f8e52b0ca7
parents 62d0e160 8569d185

packages/SystemUI/res/layout/controls_base_item.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -30,8 +30,8 @@ 




    <ImageView

    <ImageView

        android:id="@+id/icon"

        android:id="@+id/icon"

        android:layout_width="wrap_content"

        android:layout_width="@dimen/control_icon_size"

        android:layout_height="wrap_content"

        android:layout_height="@dimen/control_icon_size"

        android:paddingTop="@dimen/control_padding_adjustment"

        android:paddingTop="@dimen/control_padding_adjustment"

        android:clickable="false"

        android:clickable="false"

        android:focusable="false"

        android:focusable="false"

packages/SystemUI/res/values/dimens.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -1225,6 +1225,7 @@ 
    <dimen name="controls_top_margin">44dp</dimen>

    <dimen name="controls_top_margin">44dp</dimen>

    <dimen name="control_header_text_size">22sp</dimen>

    <dimen name="control_header_text_size">22sp</dimen>

    <dimen name="control_text_size">14sp</dimen>

    <dimen name="control_text_size">14sp</dimen>

    <dimen name="control_icon_size">24dp</dimen>

    <dimen name="control_spacing">4dp</dimen>

    <dimen name="control_spacing">4dp</dimen>

    <dimen name="control_list_divider">1dp</dimen>

    <dimen name="control_list_divider">1dp</dimen>

    <dimen name="control_corner_radius">12dp</dimen>

    <dimen name="control_corner_radius">12dp</dimen>

packages/SystemUI/src/com/android/systemui/controls/ui/ControlViewHolder.kt

+6 −1
Original line number Original line Diff line number Diff line
@@ -21,6 +21,7 @@ import android.graphics.drawable.ClipDrawable 
import android.graphics.drawable.GradientDrawable

import android.graphics.drawable.GradientDrawable

import android.graphics.drawable.LayerDrawable

import android.graphics.drawable.LayerDrawable

import android.service.controls.Control

import android.service.controls.Control

import android.service.controls.DeviceTypes

import android.service.controls.actions.ControlAction

import android.service.controls.actions.ControlAction

import android.service.controls.templates.ControlTemplate

import android.service.controls.templates.ControlTemplate

import android.service.controls.templates.StatelessTemplate

import android.service.controls.templates.StatelessTemplate
@@ -156,7 +157,11 @@ class ControlViewHolder( 
        statusExtra.setTextColor(fg)

        statusExtra.setTextColor(fg)





        icon.setImageDrawable(ri.icon)

        icon.setImageDrawable(ri.icon)



        // do not color app icons

        if (deviceType != DeviceTypes.TYPE_ROUTINE) {

            icon.setImageTintList(fg)

            icon.setImageTintList(fg)

        }





        (clipLayer.getDrawable() as GradientDrawable).apply {

        (clipLayer.getDrawable() as GradientDrawable).apply {

            setColor(context.getResources().getColor(bg, context.getTheme()))

            setColor(context.getResources().getColor(bg, context.getTheme()))

packages/SystemUI/src/com/android/systemui/controls/ui/RenderInfo.kt

+1 −1
Original line number Original line Diff line number Diff line
@@ -64,7 +64,7 @@ data class RenderInfo( 




            val iconState = deviceIconMap.getValue(iconKey)

            val iconState = deviceIconMap.getValue(iconKey)

            val resourceId = iconState[enabled]

            val resourceId = iconState[enabled]

            var icon: Drawable? = null

            var icon: Drawable?

            if (resourceId == APP_ICON_ID) {

            if (resourceId == APP_ICON_ID) {

                icon = appIconMap.get(componentName)

                icon = appIconMap.get(componentName)

                if (icon == null) {

                if (icon == null) {