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

Commit fddaab1e authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Automerger Merge Worker
Browse files

Merge "Media - Limit size of output switcher and app name" into rvc-dev am: 3d8df7b6 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11973247

Change-Id: Id5db8a1ccbe4862c3dd0ed6dea8b44040006cd40
parents 9ebe5f00 3d8df7b6

packages/SystemUI/res/layout/media_view.xml

+8 −9
Original line number Diff line number Diff line
@@ -27,6 +27,14 @@ 
    android:forceHasOverlappingRendering="false"

    android:background="@drawable/qs_media_background">



    <androidx.constraintlayout.widget.Guideline

        android:id="@+id/center_vertical_guideline"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:orientation="vertical"

        app:layout_constraintGuide_percent="0.5"

        />



    <!-- As per Material Design on Biderectionality, this is forced to LTR in code -->

    <FrameLayout

        android:id="@+id/notification_media_progress_time"
@@ -156,15 +164,6 @@ 
        android:src="@drawable/ic_cast_connected"

        android:forceHasOverlappingRendering="false" />



    <androidx.constraintlayout.widget.Barrier

        android:id="@+id/media_seamless_barrier"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        app:barrierDirection="start"

        app:constraint_referenced_ids="media_seamless,media_seamless_fallback"

        app:barrierAllowsGoneWidgets="false"

        />



    <!-- Seek Bar -->

    <!-- As per Material Design on Biderectionality, this is forced to LTR in code -->

    <SeekBar

packages/SystemUI/res/values/dimens.xml

+1 −0
Original line number Diff line number Diff line
@@ -1269,6 +1269,7 @@ 
    <dimen name="qs_media_padding">16dp</dimen>

    <dimen name="qs_media_panel_outer_padding">16dp</dimen>

    <dimen name="qs_media_album_size">52dp</dimen>

    <dimen name="qs_center_guideline_padding">10dp</dimen>

    <dimen name="qs_seamless_icon_size">20dp</dimen>

    <dimen name="qs_seamless_fallback_icon_size">20dp</dimen>

    <dimen name="qs_seamless_fallback_top_margin">18dp</dimen>

packages/SystemUI/res/xml/media_collapsed.xml

+8 −2
Original line number Diff line number Diff line
@@ -31,12 +31,12 @@ 
        android:id="@+id/app_name"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_marginEnd="10dp"

        android:layout_marginEnd="@dimen/qs_center_guideline_padding"

        android:layout_marginStart="10dp"

        android:layout_marginTop="20dp"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintStart_toEndOf="@id/icon"

        app:layout_constraintEnd_toStartOf="@id/media_seamless_barrier"

        app:layout_constraintEnd_toStartOf="@id/center_vertical_guideline"

        app:layout_constraintHorizontal_bias="0"

        />
@@ -47,8 +47,11 @@ 
        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintWidth_min="60dp"

        app:layout_constraintStart_toEndOf="@id/center_vertical_guideline"

        app:layout_constraintHorizontal_bias="1"

        android:layout_marginTop="@dimen/qs_media_panel_outer_padding"

        android:layout_marginEnd="@dimen/qs_media_panel_outer_padding"

        android:layout_marginStart="@dimen/qs_center_guideline_padding"

        />



    <Constraint
@@ -57,10 +60,13 @@ 
        android:layout_height="@dimen/qs_seamless_fallback_icon_size"

        android:layout_marginTop="@dimen/qs_seamless_fallback_top_margin"

        android:layout_marginEnd="@dimen/qs_seamless_fallback_end_margin"

        android:layout_marginStart="@dimen/qs_center_guideline_padding"

        android:alpha="0.5"

        android:visibility="gone"

        app:layout_constraintHorizontal_bias="1"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintStart_toEndOf="@id/center_vertical_guideline"

        />



    <Constraint

packages/SystemUI/res/xml/media_expanded.xml

+8 −2
Original line number Diff line number Diff line
@@ -31,12 +31,12 @@ 
        android:id="@+id/app_name"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_marginEnd="10dp"

        android:layout_marginEnd="@dimen/qs_center_guideline_padding"

        android:layout_marginStart="10dp"

        android:layout_marginTop="20dp"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintStart_toEndOf="@id/icon"

        app:layout_constraintEnd_toStartOf="@id/media_seamless_barrier"

        app:layout_constraintEnd_toStartOf="@id/center_vertical_guideline"

        app:layout_constraintHorizontal_bias="0"

        />
@@ -46,9 +46,12 @@ 
        android:layout_height="wrap_content"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintStart_toEndOf="@id/center_vertical_guideline"

        app:layout_constraintHorizontal_bias="1"

        app:layout_constraintWidth_min="60dp"

        android:layout_marginTop="@dimen/qs_media_panel_outer_padding"

        android:layout_marginEnd="@dimen/qs_media_panel_outer_padding"

        android:layout_marginStart="@dimen/qs_center_guideline_padding"

        />



    <Constraint
@@ -57,10 +60,13 @@ 
        android:layout_height="@dimen/qs_seamless_fallback_icon_size"

        android:layout_marginTop="@dimen/qs_seamless_fallback_top_margin"

        android:layout_marginEnd="@dimen/qs_seamless_fallback_end_margin"

        android:layout_marginStart="@dimen/qs_center_guideline_padding"

        android:alpha="0.5"

        android:visibility="gone"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintStart_toEndOf="@id/center_vertical_guideline"

        app:layout_constraintHorizontal_bias="1"

        />



    <Constraint