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

Commit 5acbf8a7 authored by Austin Tankiang's avatar Austin Tankiang
Browse files

Fix job progress item title styles 

This makes the title properly ellipsize when collapsed (along with
removing the redundant collapsed style).

This also fixes the title not taking up enough space sometimes. Without
the constrainedHeight property, the layout sometimes doesn't accomodate
for changes in the textView's height.

Bug: 415207574
Test: manual inspection
Flag: com.android.documentsui.flags.visual_signals_ro
Change-Id: I71bb5dab3499ceaab588314833a94d2c6aa5f070
parent d842dd59

res/flag(com.android.documentsui.flags.use_material3)/layout/job_progress_item.xml

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
            android:layout_height="wrap_content"

            android:layout_marginTop="@dimen/job_progress_item_padding"

            android:layout_marginStart="@dimen/job_progress_item_padding"

            app:layout_constrainedHeight="true"

            app:layout_constraintStart_toStartOf="parent"

            app:layout_constraintEnd_toStartOf="@id/job_progress_item_expand"

            app:layout_constraintTop_toTopOf="parent" />

res/flag(com.android.documentsui.flags.use_material3)/values/styles_m3.xml

+1 −5
Original line number Diff line number Diff line
@@ -229,15 +229,11 @@ 
    <style name="JobProgressItemCardBaseShape" parent="@style/ShapeAppearance.Material3.Corner.ExtraSmall" />



    <style name="JobProgressItemTitleStyle" parent="">

        <item name="android:ellipsize">end</item>

        <item name="android:textAppearance">@style/JobProgressItemTitleText</item>

        <item name="android:textAlignment">viewStart</item>

    </style>



    <style name="JobProgressItemTitleStyle.Collapsed">

        <item name="android:ellipsize">end</item>

        <item name="android:maxLines">1</item>

    </style>



    <style name="JobProgressItemExpandButtonStyle" parent="@style/Widget.Material3.Button.IconButton.Filled">

        <item name="android:insetBottom">0dp</item>

        <item name="android:insetLeft">0dp</item>

src/com/android/documentsui/JobPanelController.kt

+9 −4
Original line number Diff line number Diff line
@@ -116,10 +116,15 @@ class JobPanelController(private val activityContext: Context) : BroadcastReceiv 


        fun setJobProgress(jobProgress: JobProgress, expanded: Boolean) {

            titleView.text = jobProgress.msg

            toggleExpandButton.icon = context.getDrawable(when (expanded) {

                true -> getRes(R.drawable.ic_job_progress_collapse)

                false -> getRes(R.drawable.ic_job_progress_expand)

            })

            if (expanded) {

                titleView.isSingleLine = false

                toggleExpandButton.icon =

                    context.getDrawable(getRes(R.drawable.ic_job_progress_collapse))

            } else {

                titleView.isSingleLine = true

                toggleExpandButton.icon =

                    context.getDrawable(getRes(R.drawable.ic_job_progress_expand))

            }



            updateProgressBar(jobProgress)

            setStatusText(jobProgress, expanded)