Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Controls a11y - Set activity titles" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-04-10 20:14:08 +00:00
committed by Android (Google) Code Review
parent 55815db140 269a7b4dce
commit 186affa9af
5 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/AndroidManifest.xml
View File

@@ -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"

3
packages/SystemUI/res/layout/controls_base_item.xml
View File

@@ -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"

2
packages/SystemUI/res/layout/controls_management.xml
View File

@@ -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

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

@@ -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)

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

@@ -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