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

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

Merge "Controls a11y - Set activity titles" into rvc-dev am: 186affa9 am: 8d5c57ad 

Change-Id: Ic814dcfbce00e9a682aa713f67585c0b8d5e4bc3
parents 238bce98 8d5c57ad

packages/SystemUI/AndroidManifest.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -670,7 +670,7 @@ 
        </activity>

        </activity>





        <activity android:name=".controls.management.ControlsProviderSelectorActivity"

        <activity android:name=".controls.management.ControlsProviderSelectorActivity"

                  android:label="Controls Providers"

                  android:label="@string/controls_providers_title"

                  android:theme="@style/Theme.ControlsManagement"

                  android:theme="@style/Theme.ControlsManagement"

                  android:showForAllUsers="true"

                  android:showForAllUsers="true"

                  android:clearTaskOnLaunch="true"

                  android:clearTaskOnLaunch="true"

packages/SystemUI/res/layout/controls_base_item.xml

+2 −1
Original line number Original line Diff line number Diff line
@@ -45,7 +45,8 @@ 
        android:textAppearance="@style/TextAppearance.Control.Status"

        android:textAppearance="@style/TextAppearance.Control.Status"

        android:paddingTop="@dimen/control_padding_adjustment"

        android:paddingTop="@dimen/control_padding_adjustment"

        android:paddingStart="@dimen/control_status_padding"

        android:paddingStart="@dimen/control_status_padding"

        android:clickable="true"

        android:screenReaderFocusable="false"

        android:clickable="false"

        android:focusable="false"

        android:focusable="false"

        android:singleLine="true"

        android:singleLine="true"

        android:ellipsize="marquee"

        android:ellipsize="marquee"

packages/SystemUI/res/layout/controls_management.xml

+2 −0
Original line number Original line Diff line number Diff line
@@ -29,6 +29,8 @@ 
        android:orientation="horizontal"

        android:orientation="horizontal"

        android:layout_width="wrap_content"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

        android:focusable="false"

        android:clickable="false"

        android:gravity="center_vertical">

        android:gravity="center_vertical">





        <FrameLayout

        <FrameLayout

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

+4 −1
Original line number Original line Diff line number Diff line
@@ -239,8 +239,11 @@ class ControlsFavoritingActivity @Inject constructor( 
            }

            }

        }

        }





        val title = structureExtra

            ?: (appName ?: resources.getText(R.string.controls_favorite_default_title))

        setTitle(title)

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

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

            text = appName ?: resources.getText(R.string.controls_favorite_default_title)

            text = title

        }

        }

        requireViewById<TextView>(R.id.subtitle).text =

        requireViewById<TextView>(R.id.subtitle).text =

                resources.getText(R.string.controls_favorite_subtitle)

                resources.getText(R.string.controls_favorite_subtitle)

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -64,6 +64,7 @@ class ControlsProviderSelectorActivity @Inject constructor( 




    override fun onCreate(savedInstanceState: Bundle?) {

    override fun onCreate(savedInstanceState: Bundle?) {

        super.onCreate(savedInstanceState)

        super.onCreate(savedInstanceState)



        setContentView(R.layout.controls_management)

        setContentView(R.layout.controls_management)

        requireViewById<ViewStub>(R.id.stub).apply {

        requireViewById<ViewStub>(R.id.stub).apply {

            layoutResource = R.layout.controls_management_apps

            layoutResource = R.layout.controls_management_apps