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

Commit 5460f4c5 authored by Shamali Patwa's avatar Shamali Patwa Committed by Android (Google) Code Review
Browse files

Merge "Pass title and description as intent params to the picker" into main

parents 7187056a c9b98560

packages/SystemUI/res/values/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -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] -->

packages/SystemUI/src/com/android/systemui/communal/ui/viewmodel/CommunalEditModeViewModel.kt

+7 −0
Original line number Diff line number Diff line
@@ -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"