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

Commit b1b02f0f authored by Anton Potapov's avatar Anton Potapov
Browse files

Add support for ThumbnailTemplate inside TemperatureControlTemplate 

Test: manual: open Device Controls with the problematic template
Test: atest TemperatureControlBehaviorTest
Fixes: 287630195
Change-Id: I135c01aaa84fdc7815cfb800f5b18cf7fe8f0703
parent 836944da

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

+4 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.graphics.drawable.ClipDrawable 
import android.graphics.drawable.LayerDrawable

import android.view.View

import android.service.controls.Control

import android.service.controls.templates.TemperatureControlTemplate

import android.service.controls.templates.ThumbnailTemplate

import android.util.TypedValue
@@ -68,7 +69,9 @@ class ThumbnailBehavior(currentUserId: Int) : Behavior { 
    override fun bind(cws: ControlWithState, colorOffset: Int) {

        this.control = cws.control!!

        cvh.setStatusText(control.getStatusText())

        template = control.getControlTemplate() as ThumbnailTemplate

        template = control.controlTemplate as? ThumbnailTemplate

                ?: (control.controlTemplate as TemperatureControlTemplate).template

                        as ThumbnailTemplate



        val ld = cvh.layout.getBackground() as LayerDrawable

        val clipLayer = ld.findDrawableByLayerId(R.id.clip_layer) as ClipDrawable

packages/SystemUI/tests/src/com/android/systemui/controls/ui/TemperatureControlBehaviorTest.kt

0 → 100644
+98 −0
Original line number Diff line number Diff line 
package com.android.systemui.controls.ui



import android.app.PendingIntent

import android.content.ComponentName

import android.content.Intent

import android.graphics.drawable.Icon

import android.service.controls.Control

import android.service.controls.DeviceTypes

import android.service.controls.templates.TemperatureControlTemplate

import android.service.controls.templates.ThumbnailTemplate

import android.view.LayoutInflater

import android.view.ViewGroup

import androidx.test.filters.SmallTest

import com.android.systemui.R

import com.android.systemui.SysuiTestCase

import com.android.systemui.controls.ControlsMetricsLogger

import com.android.systemui.controls.controller.ControlInfo

import com.android.systemui.controls.controller.ControlsController

import com.android.systemui.util.concurrency.FakeExecutor

import com.android.systemui.util.time.FakeSystemClock

import org.junit.Before

import org.junit.Test

import org.mockito.Mock

import org.mockito.MockitoAnnotations



@SmallTest

class TemperatureControlBehaviorTest : SysuiTestCase() {



    @Mock lateinit var controlsMetricsLogger: ControlsMetricsLogger

    @Mock lateinit var controlActionCoordinator: ControlActionCoordinator

    @Mock lateinit var controlsController: ControlsController



    private val fakeSystemClock = FakeSystemClock()

    private val underTest = TemperatureControlBehavior()



    private lateinit var viewHolder: ControlViewHolder



    @Before

    fun setup() {

        MockitoAnnotations.initMocks(this)



        viewHolder =

            ControlViewHolder(

                LayoutInflater.from(mContext).inflate(R.layout.controls_base_item, null, false)

                    as ViewGroup,

                controlsController,

                FakeExecutor(fakeSystemClock),

                FakeExecutor(fakeSystemClock),

                controlActionCoordinator,

                controlsMetricsLogger,

                0,

                0,

            )

    }



    @Test

    fun testBehaviourSupportsThumbnailSubBehaviour() {

        val controlWithState =

            ControlWithState(

                ComponentName("test.pkg", "TestClass"),

                ControlInfo(

                    "test_id",

                    "test title",

                    "test subtitle",

                    DeviceTypes.TYPE_AC_UNIT,

                ),

                Control.StatefulBuilder(

                        "",

                        PendingIntent.getActivity(

                            context,

                            0,

                            Intent(),

                            PendingIntent.FLAG_IMMUTABLE,

                        ),

                    )

                    .setControlTemplate(

                        TemperatureControlTemplate(

                            "test id",

                            ThumbnailTemplate(

                                "test id",

                                false,

                                Icon.createWithContentUri(""),

                                "test description",

                            ),

                            0,

                            0,

                            0

                        )

                    )

                    .setStatus(Control.STATUS_OK)

                    .build()

            )

        viewHolder.bindData(controlWithState, false)

        underTest.initialize(viewHolder)



        underTest.bind(controlWithState, 0) // no crash

    }

}