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

Commit 1eb40ef1 authored by Fabian Kozynski's avatar Fabian Kozynski
Browse files

Change error and none messages 

When loading controls returns an error or no controls, show an
informative message.

Test: manual
Fixes: 156923066

Change-Id: Iae3bdb5707d5cda5d970b8a9fc439420eb4f6f8d
parent c744ad24

packages/SystemUI/res/layout/controls_management_favorites.xml

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ 
        android:layout_height="wrap_content"

        android:layout_marginTop="@dimen/controls_management_list_margin"

        android:textAppearance="?android:attr/textAppearanceSmall"

        android:layout_marginStart="@dimen/controls_management_status_side_margin"

        android:layout_marginEnd="@dimen/controls_management_status_side_margin"

        android:gravity="center_horizontal"

    />

packages/SystemUI/res/values/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -1325,8 +1325,8 @@ 
    <dimen name="controls_management_editing_list_margin">48dp</dimen>

    <dimen name="controls_management_editing_divider_margin">24dp</dimen>

    <dimen name="controls_management_apps_extra_side_margin">8dp</dimen>

    <dimen name="controls_management_apps_top_margin"></dimen>

    <dimen name="controls_management_zone_top_margin">32dp</dimen>

    <dimen name="controls_management_status_side_margin">16dp</dimen>

    <dimen name="controls_management_page_indicator_height">24dp</dimen>

    <dimen name="controls_management_checkbox_size">25dp</dimen>

    <dimen name="controls_title_size">24sp</dimen>

packages/SystemUI/res/values/strings.xml

+4 −2
Original line number Diff line number Diff line
@@ -2741,8 +2741,10 @@ 
    <!-- Controls management favorites screen, See other apps with changes made [CHAR LIMIT=NONE] -->

    <string name="controls_favorite_toast_no_changes">Changes not saved</string>



    <!-- Controls management controls screen error on load message [CHAR LIMIT=60] -->

    <string name="controls_favorite_load_error">The list of all controls could not be loaded.</string>

    <!-- Controls management controls screen error on load message [CHAR LIMIT=NONE] -->

    <string name="controls_favorite_load_error">Controls could not be loaded. Check the <xliff:g id="app" example="System UI">%s</xliff:g> app to make sure that the app settings haven\u2019t changed.</string>

    <!-- Controls management controls screen no controls found on load message [CHAR LIMIT=NONE] -->

    <string name="controls_favorite_load_none">Compatible controls unavailable</string>

    <!-- Controls management controls screen header for Other zone [CHAR LIMIT=60] -->

    <string name="controls_favorite_other_zone_header">Other</string>

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

+10 −3
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ class ControlsFavoritingActivity @Inject constructor( 
    private lateinit var structurePager: ViewPager2

    private lateinit var statusText: TextView

    private lateinit var titleView: TextView

    private lateinit var subtitleView: TextView

    private lateinit var pageIndicator: ManagementPageIndicator

    private var mTooltipManager: TooltipManager? = null

    private lateinit var doneButton: View
@@ -165,7 +166,12 @@ class ControlsFavoritingActivity @Inject constructor( 
                    structurePager.adapter = StructureAdapter(listOfStructures)

                    structurePager.setCurrentItem(structureIndex)

                    if (error) {

                        statusText.text = resources.getText(R.string.controls_favorite_load_error)

                        statusText.text = resources.getString(R.string.controls_favorite_load_error,

                                appName ?: "")

                        subtitleView.visibility = View.GONE

                    } else if (listOfStructures.isEmpty()) {

                        statusText.text = resources.getString(R.string.controls_favorite_load_none)

                        subtitleView.visibility = View.GONE

                    } else {

                        statusText.visibility = View.GONE

                    }
@@ -266,8 +272,9 @@ class ControlsFavoritingActivity @Inject constructor( 
        titleView = requireViewById<TextView>(R.id.title).apply {

            text = title

        }

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

                resources.getText(R.string.controls_favorite_subtitle)

        subtitleView = requireViewById<TextView>(R.id.subtitle).apply {

            text = resources.getText(R.string.controls_favorite_subtitle)

        }

        structurePager = requireViewById<ViewPager2>(R.id.structure_pager)

        structurePager.registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() {

            override fun onPageSelected(position: Int) {