diff options
5 files changed, 10 insertions, 3 deletions
diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml index c6f03271f931..f767636f7c55 100644 --- a/packages/SystemUI/AndroidManifest.xml +++ b/packages/SystemUI/AndroidManifest.xml @@ -670,7 +670,7 @@ </activity> <activity android:name=".controls.management.ControlsProviderSelectorActivity" - android:label="Controls Providers" + android:label="@string/controls_providers_title" android:theme="@style/Theme.ControlsManagement" android:showForAllUsers="true" android:clearTaskOnLaunch="true" diff --git a/packages/SystemUI/res/layout/controls_base_item.xml b/packages/SystemUI/res/layout/controls_base_item.xml index db81e2348cd8..55c9083e4147 100644 --- a/packages/SystemUI/res/layout/controls_base_item.xml +++ b/packages/SystemUI/res/layout/controls_base_item.xml @@ -45,7 +45,8 @@ android:textAppearance="@style/TextAppearance.Control.Status" android:paddingTop="@dimen/control_padding_adjustment" android:paddingStart="@dimen/control_status_padding" - android:clickable="true" + android:screenReaderFocusable="false" + android:clickable="false" android:focusable="false" android:singleLine="true" android:ellipsize="marquee" diff --git a/packages/SystemUI/res/layout/controls_management.xml b/packages/SystemUI/res/layout/controls_management.xml index 9d5eb63ba795..ae57563cfb09 100644 --- a/packages/SystemUI/res/layout/controls_management.xml +++ b/packages/SystemUI/res/layout/controls_management.xml @@ -29,6 +29,8 @@ android:orientation="horizontal" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:focusable="false" + android:clickable="false" android:gravity="center_vertical"> <FrameLayout diff --git a/packages/SystemUI/src/com/android/systemui/controls/management/ControlsFavoritingActivity.kt b/packages/SystemUI/src/com/android/systemui/controls/management/ControlsFavoritingActivity.kt index fe1e6328820d..070c4f36b39a 100644 --- a/packages/SystemUI/src/com/android/systemui/controls/management/ControlsFavoritingActivity.kt +++ b/packages/SystemUI/src/com/android/systemui/controls/management/ControlsFavoritingActivity.kt @@ -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 { - text = appName ?: resources.getText(R.string.controls_favorite_default_title) + text = title } requireViewById<TextView>(R.id.subtitle).text = resources.getText(R.string.controls_favorite_subtitle) diff --git a/packages/SystemUI/src/com/android/systemui/controls/management/ControlsProviderSelectorActivity.kt b/packages/SystemUI/src/com/android/systemui/controls/management/ControlsProviderSelectorActivity.kt index 0c41f7e5df5a..3be59009f531 100644 --- a/packages/SystemUI/src/com/android/systemui/controls/management/ControlsProviderSelectorActivity.kt +++ b/packages/SystemUI/src/com/android/systemui/controls/management/ControlsProviderSelectorActivity.kt @@ -64,6 +64,7 @@ class ControlsProviderSelectorActivity @Inject constructor( override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + setContentView(R.layout.controls_management) requireViewById<ViewStub>(R.id.stub).apply { layoutResource = R.layout.controls_management_apps |