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

Commit 45e0e09b authored by Yvonne Jiang's avatar Yvonne Jiang
Browse files

Load trailing icon drawable from the correct package in SupervisionPromoFooterPreference. 

Bug: 399497788
Test: atest SupervisionPromoFooterPreferenceTest
Test: manually
Flag: android.app.supervision.flags.enable_supervision_settings_screen
Change-Id: I65c2c4575cd9f6dcc4bd874456503538d8f8dc01
parent 4492212a

src/com/android/settings/supervision/SupervisionPromoFooterPreference.kt

+10 −9
Original line number Diff line number Diff line
@@ -72,16 +72,17 @@ class SupervisionPromoFooterPreference( 
            preference.title = preferenceData?.title ?: preference.title

            preference.summary = preferenceData?.summary ?: preference.summary

            preference.icon = leadingIcon ?: preference.icon

            val trailingIcon: Int? = preferenceData?.trailingIcon

            if (trailingIcon != null) {

            val trailingIcon =

                preferenceData?.trailingIcon?.let {

                    val resourcePackage = preferenceDataProvider.packageName

                    Icon.createWithResource(resourcePackage, it).loadDrawable(context)

                }

            (preference as CardPreference).setAdditionalAction(

                trailingIcon,

                // TODO(b/411279121): add content description once we have the finalized string.

                contentDescription = "",

            ) {

                    @SuppressLint("RestrictedApi")

                    it.performClick()

                }

                @SuppressLint("RestrictedApi") it.performClick()

            }

        }