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

Commit cc9f22c1 authored by Edgar Wang's avatar Edgar Wang Committed by Android (Google) Code Review
Browse files

Merge "Fix preference grouping in SettingsPreferenceGroupAdapter" into main

parents aa13cea0 e67e9465

packages/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/SettingsPreferenceGroupAdapter.kt

+3 −1
Original line number Diff line number Diff line
@@ -146,7 +146,9 @@ open class SettingsPreferenceGroupAdapter(preferenceGroup: PreferenceGroup) : 


                        // item in the group should have round corner background.

                        cornerStyles[i] = cornerStyles[i] or ROUND_CORNER_CENTER

                        if (parent === currentParent) {

                        // We should treat the ExpandButton as a part of the previous group

                        // despite that it doesn't have a parent.

                        if (parent === currentParent || parent == null) {

                            // find the first item in the group

                            if (startIndex == -1) {

                                startIndex = i