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

Commit b2560f5e authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add space between action buttons and song name" into main

parents f04c23c6 0c5e9bb0

packages/SystemUI/res/layout/media_session_view.xml

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ 
        android:layout_width="0dp"

        android:layout_height="0dp"

        android:orientation="vertical"

        app:layout_constraintGuide_end="@dimen/qs_media_session_collapsed_guideline" />

        app:layout_constraintGuide_end="@dimen/qs_media_session_collapsed_legacy_guideline" />



    <!-- App icon -->

    <com.android.internal.widget.CachingIconView

packages/SystemUI/res/values/dimens.xml

+2 −1
Original line number Diff line number Diff line
@@ -1310,7 +1310,8 @@ 
    <dimen name="qs_media_seekbar_progress_amplitude">1.5dp</dimen>

    <dimen name="qs_media_seekbar_progress_phase">8dp</dimen>

    <dimen name="qs_media_seekbar_progress_stroke_width">2dp</dimen>

    <dimen name="qs_media_session_collapsed_guideline">144dp</dimen>

    <dimen name="qs_media_session_collapsed_legacy_guideline">144dp</dimen>

    <dimen name="qs_media_session_collapsed_guideline">168dp</dimen>



    <!-- Size of Smartspace media recommendations cards in the QSPanel carousel -->

    <dimen name="qs_media_rec_default_width">380dp</dimen>

packages/SystemUI/res/xml/media_session_collapsed.xml

+7 −0
Original line number Diff line number Diff line
@@ -63,6 +63,13 @@ 
        app:layout_constraintTop_toTopOf="@+id/album_art"

        app:layout_constraintBottom_toBottomOf="@+id/album_art" />



    <Constraint

        android:id="@+id/action_button_guideline"

        android:layout_width="0dp"

        android:layout_height="0dp"

        android:orientation="vertical"

        app:layout_constraintGuide_end="@dimen/qs_media_session_collapsed_legacy_guideline" />



    <Constraint

        android:id="@+id/header_title"

        android:layout_width="0dp"

packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaViewController.kt

+8 −2
Original line number Diff line number Diff line
@@ -1040,13 +1040,19 @@ constructor( 
                expandedLayout.load(context, R.xml.media_recommendations_expanded)

            }

        }

        readjustPlayPauseWidth()

        readjustUIUpdateConstraints()

        refreshState()

    }



    private fun readjustPlayPauseWidth() {

    private fun readjustUIUpdateConstraints() {

        // TODO: move to xml file when flag is removed.

        if (Flags.mediaControlsUiUpdate()) {

            collapsedLayout.setGuidelineEnd(

                R.id.action_button_guideline,

                context.resources.getDimensionPixelSize(

                    R.dimen.qs_media_session_collapsed_guideline

                ),

            )

            collapsedLayout.constrainWidth(

                R.id.actionPlayPause,

                context.resources.getDimensionPixelSize(R.dimen.qs_media_action_play_pause_width),