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

Commit 66a3db88 authored by Edgar Wang's avatar Edgar Wang
Browse files

[CollapsableTextView] Update collapse button visibility based on text lines. 

Show button if text lines are larger than the minLines.
Otherwise, hide the collapse button.
The real text lines are measured when onMeasure

Bug: 395190715
Test: visual
Flag: EXEMPT bug fix
Change-Id: I384d48ab3218b1ab8a3ea0cc4ad537bdce528485
parent 4ef82094

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

+7 −1
Original line number Diff line number Diff line
@@ -120,6 +120,11 @@ class CollapsableTextView @JvmOverloads constructor( 
        }

    }



    override fun onMeasure(p0: Int, p1: Int) {

        super.onMeasure(p0, p1)

        updateView()

    }



    /**

     * Sets the text content of the CollapsableTextView.

     * @param text The text to display.
@@ -243,7 +248,8 @@ class CollapsableTextView @JvmOverloads constructor( 
                titleTextView.ellipsize = TextUtils.TruncateAt.END

            }

        }

        collapseButton.visibility = if (isCollapsable) VISIBLE else GONE

        collapseButton.visibility =

            if (isCollapsable && titleTextView.lineCount > minLines) VISIBLE else GONE

        learnMoreTextView.visibility = if (isLearnMoreEnabled && !isCollapsed) VISIBLE else GONE

    }