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

Commit b6ec6073 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Controls a11y - Various fixes" into rvc-dev am: da83ef88 

Change-Id: I612813175c41ba7dd88fc9fb604e612218a336f9
parents b2677f2d da83ef88

packages/SystemUI/res/layout/controls_dialog_pin.xml

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
      android:layout_width="match_parent"

      android:layout_height="wrap_content"

      android:minHeight="48dp"

      android:longClickable="false"

      android:inputType="numberPassword" />

  <CheckBox

      android:id="@+id/controls_pin_use_alpha"

packages/SystemUI/src/com/android/systemui/controls/management/ControlsEditingActivity.kt

+1 −0
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ class ControlsEditingActivity @Inject constructor( 
            inflate()

        }

        requireViewById<TextView>(R.id.title).text = structure

        setTitle(structure)

        subtitle = requireViewById<TextView>(R.id.subtitle).apply {

            setText(SUBTITLE_ID)

        }

packages/SystemUI/src/com/android/systemui/controls/management/ControlsFavoritingActivity.kt

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ class ControlsFavoritingActivity @Inject constructor( 
                    val name = listOfStructures[position].structureName

                    val title = if (!TextUtils.isEmpty(name)) name else appName

                    titleView.text = title

                    setTitle(title)

                    titleView.requestFocus()

                }



                override fun onPageScrolled(

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

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ object ChallengeDialogs { 
        }

        val builder = AlertDialog.Builder(cvh.context, STYLE).apply {

            val res = cvh.context.resources

            setMessage(res.getString(

            setTitle(res.getString(

                R.string.controls_confirmation_message, cvh.title.getText()))

            setPositiveButton(

                android.R.string.ok,

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

+6 −2
Original line number Diff line number Diff line
@@ -145,8 +145,7 @@ class ControlViewHolder( 
        }



        behavior = bindBehavior(behavior, findBehaviorClass(controlStatus, template, deviceType))



        layout.setContentDescription("${title.text} ${subtitle.text} ${status.text}")

        updateContentDescription()

    }



    fun actionResponse(@ControlAction.ResponseResult response: Int) {
@@ -191,11 +190,16 @@ class ControlViewHolder( 


        cancelUpdate = uiExecutor.executeDelayed({

                status.setText(previousText)

                updateContentDescription()

            }, UPDATE_DELAY_IN_MILLIS)



        status.setText(tempStatus)

        updateContentDescription()

    }



    private fun updateContentDescription() =

        layout.setContentDescription("${title.text} ${subtitle.text} ${status.text}")



    fun action(action: ControlAction) {

        lastAction = action

        controlsController.action(cws.componentName, cws.ci, action)