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

Commit 35b6bd10 authored by Beth Thibodeau's avatar Beth Thibodeau Committed by Android (Google) Code Review
Browse files

Merge "Fix width with long metadata strings" into main

parents 2254ea7d 4b19e039

packages/SystemUI/res/xml/media_session_collapsed.xml

+5 −5
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ 


    <Constraint

        android:id="@+id/header_title"

        android:layout_width="wrap_content"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_marginTop="20dp"

        android:layout_marginStart="@dimen/qs_media_padding"
@@ -87,13 +87,11 @@ 
        app:layout_constraintEnd_toStartOf="@id/header_artist"

        app:layout_constraintTop_toTopOf="@id/header_artist"

        app:layout_constraintBottom_toBottomOf="@id/header_artist"

        app:layout_constraintVertical_bias="0"

        app:layout_constraintHorizontal_bias="0"

        app:layout_constraintHorizontal_chainStyle="packed" />

        app:layout_constraintVertical_bias="0" />



    <Constraint

        android:id="@+id/header_artist"

        android:layout_width="wrap_content"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_marginEnd="@dimen/qs_media_padding"

        android:layout_marginBottom="@dimen/qs_media_padding"
@@ -102,6 +100,8 @@ 
        app:layout_constrainedWidth="true"

        app:layout_constraintStart_toEndOf="@id/media_explicit_indicator"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintHorizontal_weight="1"

        app:layout_constraintHorizontal_chainStyle="spread_inside"

        app:layout_constraintVertical_bias="0" />



    <Constraint

packages/SystemUI/res/xml/media_session_expanded.xml

+5 −5
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ 


    <Constraint

        android:id="@+id/header_title"

        android:layout_width="wrap_content"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_marginStart="@dimen/qs_media_padding"

        android:layout_marginEnd="@dimen/qs_media_padding"
@@ -80,13 +80,11 @@ 
        app:layout_constraintStart_toStartOf="@id/header_title"

        app:layout_constraintEnd_toStartOf="@id/header_artist"

        app:layout_constraintTop_toTopOf="@id/header_artist"

        app:layout_constraintBottom_toTopOf="@id/media_action_barrier_top"

        app:layout_constraintHorizontal_bias="0"

        app:layout_constraintHorizontal_chainStyle="packed"/>

        app:layout_constraintBottom_toTopOf="@id/media_action_barrier_top" />



    <Constraint

        android:id="@+id/header_artist"

        android:layout_width="wrap_content"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_marginEnd="@dimen/qs_media_padding"

        android:layout_marginBottom="@dimen/qs_media_padding"
@@ -95,6 +93,8 @@ 
        app:layout_constraintEnd_toStartOf="@id/actionPlayPause"

        app:layout_constraintStart_toEndOf="@id/media_explicit_indicator"

        app:layout_constraintBottom_toTopOf="@id/media_action_barrier_top"

        app:layout_constraintHorizontal_weight="1"

        app:layout_constraintHorizontal_chainStyle="spread_inside"

        app:layout_constraintVertical_bias="0" />



    <Constraint