diff options
| author | 2024-07-09 02:01:40 +0000 | |
|---|---|---|
| committer | 2024-07-09 02:01:40 +0000 | |
| commit | 5460f4c5735e90d10ae70148b7f5a88c52699d4e (patch) | |
| tree | 731aa4d97be9a73f85088270455bc04d3e661389 | |
| parent | 7187056a66411a4d4f49bb9a5f4c85e8841b4608 (diff) | |
| parent | c9b98560f0fd6f6d902ff5d78380c13d2bd8be45 (diff) | |
Merge "Pass title and description as intent params to the picker" into main
| -rw-r--r-- | packages/SystemUI/res/values/strings.xml | 4 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/communal/ui/viewmodel/CommunalEditModeViewModel.kt | 7 |
2 files changed, 11 insertions, 0 deletions
diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 0637d3911b29..0bc2c82538c8 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -1235,6 +1235,10 @@ <string name="accessibility_action_label_remove_widget">remove widget</string> <!-- Label for accessibility action to place a widget in edit mode after selecting move widget. [CHAR LIMIT=NONE] --> <string name="accessibility_action_label_place_widget">place selected widget</string> + <!-- Title in the communal widget picker. [CHAR LIMIT=50] --> + <string name="communal_widget_picker_title">Lock screen widgets</string> + <!-- Text displayed below the title in the communal widget picker providing additional details about the communal surface. [CHAR LIMIT=80] --> + <string name="communal_widget_picker_description">Anyone can view widgets on your lock screen, even if your tablet\'s locked.</string> <!-- Title shown above information regarding lock screen widgets. [CHAR LIMIT=50] --> <string name="communal_widgets_disclaimer_title">Lock screen widgets</string> <!-- Information about lock screen widgets presented to the user. [CHAR LIMIT=NONE] --> diff --git a/packages/SystemUI/src/com/android/systemui/communal/ui/viewmodel/CommunalEditModeViewModel.kt b/packages/SystemUI/src/com/android/systemui/communal/ui/viewmodel/CommunalEditModeViewModel.kt index 2e92438ab890..4f54fee3f498 100644 --- a/packages/SystemUI/src/com/android/systemui/communal/ui/viewmodel/CommunalEditModeViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/communal/ui/viewmodel/CommunalEditModeViewModel.kt @@ -187,6 +187,11 @@ constructor( CommunalWidgetCategories.defaultCategories ) putExtra(EXTRA_UI_SURFACE_KEY, EXTRA_UI_SURFACE_VALUE) + putExtra(EXTRA_PICKER_TITLE, resources.getString(R.string.communal_widget_picker_title)) + putExtra( + EXTRA_PICKER_DESCRIPTION, + resources.getString(R.string.communal_widget_picker_description) + ) putParcelableArrayListExtra(EXTRA_ADDED_APP_WIDGETS_KEY, excludeList) } } @@ -214,6 +219,8 @@ constructor( private const val EXTRA_DESIRED_WIDGET_WIDTH = "desired_widget_width" private const val EXTRA_DESIRED_WIDGET_HEIGHT = "desired_widget_height" + private const val EXTRA_PICKER_TITLE = "picker_title" + private const val EXTRA_PICKER_DESCRIPTION = "picker_description" private const val EXTRA_UI_SURFACE_KEY = "ui_surface" private const val EXTRA_UI_SURFACE_VALUE = "widgets_hub" const val EXTRA_ADDED_APP_WIDGETS_KEY = "added_app_widgets" |