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

Commit 5ffffaf1 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Controls UI - GAR adjustments" into rvc-dev am: 97a8c8a1 am: 82cdea52 am: d0009bdf 

Change-Id: Idd24976a2b6b314202ccc42af22b64792cf6aad0
parents 5acb7a4f d0009bdf

packages/SystemUI/res/layout/controls_base_item.xml

+12 −1
Original line number Diff line number Diff line
@@ -21,8 +21,9 @@ 
    android:layout_weight="1"

    android:layout_height="@dimen/control_height"

    android:padding="@dimen/control_padding"

    android:clickable="true"

    android:clickable="false"

    android:focusable="true"

    android:screenReaderFocusable="true"

    android:layout_marginLeft="@dimen/control_base_item_margin"

    android:layout_marginRight="@dimen/control_base_item_margin"

    android:background="@drawable/control_background">
@@ -32,6 +33,8 @@ 
        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:paddingTop="@dimen/control_padding_adjustment"

        android:clickable="false"

        android:focusable="false"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintTop_toTopOf="parent" />
@@ -42,6 +45,8 @@ 
        android:textAppearance="@style/TextAppearance.Control.Status"

        android:paddingTop="@dimen/control_padding_adjustment"

        android:paddingStart="@dimen/control_status_padding"

        android:clickable="false"

        android:focusable="false"

        app:layout_constraintBottom_toBottomOf="@+id/icon"

        app:layout_constraintStart_toEndOf="@+id/icon" />
@@ -52,6 +57,8 @@ 
        android:textAppearance="@style/TextAppearance.Control.Status"

        android:paddingTop="@dimen/control_padding_adjustment"

        android:paddingStart="@dimen/control_status_padding"

        android:clickable="false"

        android:focusable="false"

        app:layout_constraintBottom_toBottomOf="@+id/icon"

        app:layout_constraintStart_toEndOf="@+id/status" />
@@ -62,6 +69,8 @@ 
        android:textAppearance="@style/TextAppearance.Control.Title"

        android:paddingLeft="@dimen/control_padding_adjustment"

        android:paddingRight="@dimen/control_padding_adjustment"

        android:clickable="false"

        android:focusable="false"

        app:layout_constraintBottom_toTopOf="@+id/subtitle"

        app:layout_constraintStart_toStartOf="parent" />
@@ -73,6 +82,8 @@ 
        android:paddingLeft="@dimen/control_padding_adjustment"

        android:paddingRight="@dimen/control_padding_adjustment"

        android:paddingBottom="@dimen/control_padding_adjustment"

        android:clickable="false"

        android:focusable="false"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintStart_toStartOf="parent"/>

packages/SystemUI/res/values/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -1234,7 +1234,7 @@ 
    <dimen name="control_height">106dp</dimen>

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

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

    <dimen name="control_status_normal">12sp</dimen>

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

    <dimen name="control_status_expanded">18sp</dimen>

    <dimen name="control_base_item_margin">2dp</dimen>

    <dimen name="control_status_padding">3dp</dimen>

packages/SystemUI/res/values/styles.xml

+1 −1
Original line number Diff line number Diff line
@@ -677,7 +677,7 @@ 


    <style name="TextAppearance.Control.Status">

        <item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item>

        <item name="android:textSize">@dimen/control_text_size</item>

        <item name="android:textSize">@dimen/control_status_normal</item>

        <item name="android:textColor">@color/control_primary_text</item>

    </style>

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

+10 −2
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ class ControlViewHolder( 


        cancelUpdate?.run()



        val (status, template) = cws.control?.let {

        val (controlStatus, template) = cws.control?.let {

            title.setText(it.getTitle())

            subtitle.setText(it.getSubtitle())

            Pair(it.getStatus(), it.getControlTemplate())
@@ -80,20 +80,28 @@ class ControlViewHolder( 
        }



        cws.control?.let {

            layout.setClickable(true)

            layout.setOnLongClickListener(View.OnLongClickListener() {

                ControlActionCoordinator.longPress(this@ControlViewHolder)

                true

            })

        }



        val clazz = findBehavior(status, template)

        val clazz = findBehavior(controlStatus, template)

        if (behavior == null || behavior!!::class != clazz) {

            // Behavior changes can signal a change in template from the app or

            // first time setup

            behavior = clazz.java.newInstance()

            behavior?.initialize(this)



            // let behaviors define their own, if necessary, and clear any existing ones

            layout.setAccessibilityDelegate(null)

        }



        behavior?.bind(cws)



        layout.setContentDescription(

            "${title.text} ${subtitle.text} ${status.text} ${statusExtra.text}")

    }



    fun actionResponse(@ControlAction.ResponseResult response: Int) {

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

+1 −1
Original line number Diff line number Diff line
@@ -406,7 +406,7 @@ private class ItemAdapter( 
            setText(item.getTitle())

        }

        view.requireViewById<ImageView>(R.id.app_icon).apply {

            setContentDescription(item.getTitle())

            setContentDescription(item.appName)

            setImageDrawable(item.icon)

        }

        return view