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

Commit e8ef6fa0 authored by Stefan Maftei's avatar Stefan Maftei Committed by Android (Google) Code Review
Browse files

Merge "[Expressive design] Create Expand/Collapse after adding preference in... 

Merge "[Expressive design] Create Expand/Collapse after adding preference in Banner group" into main
parents 1913a7c9 9eb83d38

packages/SettingsLib/BannerMessagePreference/src/com/android/settingslib/widget/BannerMessagePreferenceGroup.kt

+15 −9
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ class BannerMessagePreferenceGroup @JvmOverloads constructor( 
        }



        childPreferences.add(preference)

        maybeCreateExpandCollapsePreference()

        expandPreference?.let {

            it.count = childPreferences.size - 1

        }
@@ -106,6 +107,13 @@ class BannerMessagePreferenceGroup @JvmOverloads constructor( 


    override fun onBindViewHolder(holder: PreferenceViewHolder) {

        super.onBindViewHolder(holder)



        maybeCreateExpandCollapsePreference()

        updateExpandCollapsePreference()

        updateChildrenVisibility()

    }



    private fun maybeCreateExpandCollapsePreference() {

        if (childPreferences.size >= 2) {

            if (expandPreference == null) {

                expandPreference = NumberButtonPreference(context).apply {
@@ -134,8 +142,6 @@ class BannerMessagePreferenceGroup @JvmOverloads constructor( 
                super.addPreference(collapsePreference!!)

            }

        }

        updateExpandCollapsePreference()

        updateChildrenVisibility()

    }



    private fun updateExpandCollapsePreference() {