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

Commit 0399edae authored by Jiaming Cheng's avatar Jiaming Cheng
Browse files

[QSDetailedView] Fix the bt details progress bar issue 

There's no need to add the progress bar backgroud in the
details view. This cl removed it. Now when we hide the
progress bar, it will go away.

Bug: 429237908
Flag: com.android.systemui.qs_tile_detailed_view
Test: UI change only. Existing unit tests still pass.
Change-Id: I064746c74d39e4f3c355e86d9a57f56ec7ee66f9
parent 35956bfc

packages/SystemUI/res/layout/bluetooth_tile_details.xml

+0 −10
Original line number Diff line number Diff line
@@ -26,16 +26,6 @@ 
    android:layout_width="wrap_content"

    android:layout_height="wrap_content">



    <View

        android:id="@+id/bluetooth_tile_dialog_progress_background"

        android:layout_width="0dp"

        android:layout_height="0dp"

        app:layout_constraintEnd_toEndOf="@id/bluetooth_tile_dialog_progress_animation"

        app:layout_constraintStart_toStartOf="@id/bluetooth_tile_dialog_progress_animation"

        app:layout_constraintTop_toTopOf="@id/bluetooth_tile_dialog_progress_animation"

        app:layout_constraintBottom_toBottomOf="@id/bluetooth_tile_dialog_progress_animation"

        android:background="?androidprv:attr/colorSurfaceVariant" />



    <ProgressBar

        android:id="@+id/bluetooth_tile_dialog_progress_animation"

        android:layout_width="152dp"

packages/SystemUI/src/com/android/systemui/bluetooth/qsdialog/BluetoothDetailsContentManager.kt

+9 −4
Original line number Diff line number Diff line
@@ -192,11 +192,12 @@ constructor( 
        audioSharingButton = contentView.requireViewById(R.id.audio_sharing_button)

        progressBarAnimation =

            contentView.requireViewById(R.id.bluetooth_tile_dialog_progress_animation)

        progressBarBackground =

            contentView.requireViewById(R.id.bluetooth_tile_dialog_progress_background)

        scrollViewContent = contentView.requireViewById(R.id.scroll_view)



        if (isInDialog) {

            progressBarBackground =

                contentView.requireViewById(R.id.bluetooth_tile_dialog_progress_background)



            // If `QsDetailedView` is enabled, it should show the details view.

            QsDetailedView.assertInLegacyMode()
@@ -518,16 +519,20 @@ constructor( 
    private fun showProgressBar() {

        if (progressBarAnimation.visibility != VISIBLE) {

            progressBarAnimation.visibility = VISIBLE

            if (isInDialog) {

                progressBarBackground.visibility = INVISIBLE

            }

        }

    }



    private fun hideProgressBar() {

        if (progressBarAnimation.visibility != INVISIBLE) {

            progressBarAnimation.visibility = INVISIBLE

            if (isInDialog) {

                progressBarBackground.visibility = VISIBLE

            }

        }

    }



    @DeprecatedSysuiVisibleForTesting

    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)