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

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

Merge "[Expressive design] update collapsableTextView default max line" into main

parents 5c7e6d30 c450e333

packages/SettingsLib/IntroPreference/src/com/android/settingslib/widget/IntroPreference.kt

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ constructor( 
    }



    companion object {

        private const val DEFAULT_MAX_LINES = 10

        private const val DEFAULT_MAX_LINES = 50

        private const val DEFAULT_MIN_LINES = 1

        private const val DEFAULT_COLLAPSABLE = false

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -255,7 +255,7 @@ class CollapsableTextView @JvmOverloads constructor( 
    )



    companion object {

        private const val DEFAULT_MAX_LINES = 10

        private const val DEFAULT_MAX_LINES = 50

        private const val DEFAULT_MIN_LINES = 2

        private const val DEFAULT_COLLAPSABLE = true

packages/SettingsLib/TopIntroPreference/src/com/android/settingslib/widget/TopIntroPreference.kt

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ constructor( 
    }



    companion object {

        private const val DEFAULT_MAX_LINES = 10

        private const val DEFAULT_MAX_LINES = 50

        private const val DEFAULT_MIN_LINES = 2

        private const val DEFAULT_COLLAPSABLE = false