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

Commit 30a5f7a8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Reduce height of expanded media controls" into sc-dev

parents d3db1ee8 c4e1c545

packages/SystemUI/res/layout/media_view.xml

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ 
        android:maxHeight="@dimen/qs_media_enabled_seekbar_height"

        android:paddingTop="@dimen/qs_media_enabled_seekbar_vertical_padding"

        android:layout_marginTop="-22dp"

        android:paddingBottom="0dp"

        android:paddingBottom="2dp"

        android:splitTrack="false" />



    <!-- Song name -->

packages/SystemUI/res/values/dimens.xml

+5 −4
Original line number Diff line number Diff line
@@ -1287,7 +1287,7 @@ 
    <!-- Size of media cards in the QSPanel carousel -->

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

    <dimen name="qs_media_album_size_small">72dp</dimen>

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

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

    <dimen name="qs_media_album_radius">14dp</dimen>

    <dimen name="qs_media_album_device_padding">26dp</dimen>

    <dimen name="qs_media_info_margin">12dp</dimen>
@@ -1304,13 +1304,14 @@ 
    <dimen name="qs_footer_horizontal_margin">22dp</dimen>

    <dimen name="qs_media_disabled_seekbar_height">1dp</dimen>

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

    <dimen name="qs_media_enabled_seekbar_vertical_padding">31dp</dimen>

    <dimen name="qs_media_disabled_seekbar_vertical_padding">32dp</dimen>

    <dimen name="qs_media_enabled_seekbar_vertical_padding">28dp</dimen>

    <dimen name="qs_media_disabled_seekbar_vertical_padding">29dp</dimen>



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

    <dimen name="qs_aa_media_rec_album_size_collapsed">72dp</dimen>

    <dimen name="qs_aa_media_rec_album_size_expanded">80dp</dimen>

    <dimen name="qs_aa_media_rec_album_size_expanded">76dp</dimen>

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

    <dimen name="qs_aa_media_rec_album_margin_vert">4dp</dimen>

    <dimen name="qq_aa_media_rec_header_text_size">16sp</dimen>



    <!-- Window magnification -->

packages/SystemUI/res/xml/media_expanded.xml

+3 −7
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ 
        android:layout_marginEnd="@dimen/qs_media_padding"

        android:layout_marginBottom="@dimen/qs_media_info_margin"

        app:layout_constrainedWidth="true"

        android:layout_marginTop="@dimen/qs_media_info_spacing"

        android:layout_marginTop="1dp"

        app:layout_constraintTop_toBottomOf="@id/header_title"

        app:layout_constraintStart_toStartOf="@id/header_title"

        app:layout_constraintEnd_toEndOf="parent"
@@ -104,7 +104,8 @@ 
        android:id="@+id/media_progress_bar"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        app:layout_constraintTop_toBottomOf="@id/header_artist"

        android:layout_marginTop="34dp"

        app:layout_constraintTop_toBottomOf="@id/center_horizontal_guideline"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintEnd_toEndOf="parent"

        />
@@ -124,7 +125,6 @@ 
        android:id="@+id/action0"

        android:layout_width="48dp"

        android:layout_height="48dp"

        android:layout_marginTop="@dimen/qs_media_action_margin"

        android:layout_marginStart="@dimen/qs_media_padding"

        android:layout_marginEnd="@dimen/qs_media_action_spacing"

        android:layout_marginBottom="@dimen/qs_media_action_margin"
@@ -139,7 +139,6 @@ 
        android:id="@+id/action1"

        android:layout_width="48dp"

        android:layout_height="48dp"

        android:layout_marginTop="@dimen/qs_media_action_margin"

        android:layout_marginStart="@dimen/qs_media_action_spacing"

        android:layout_marginEnd="@dimen/qs_media_action_spacing"

        android:layout_marginBottom="@dimen/qs_media_action_margin"
@@ -153,7 +152,6 @@ 
        android:id="@+id/action2"

        android:layout_width="48dp"

        android:layout_height="48dp"

        android:layout_marginTop="@dimen/qs_media_action_margin"

        android:layout_marginStart="@dimen/qs_media_action_spacing"

        android:layout_marginEnd="@dimen/qs_media_action_spacing"

        android:layout_marginBottom="@dimen/qs_media_action_margin"
@@ -167,7 +165,6 @@ 
        android:id="@+id/action3"

        android:layout_width="48dp"

        android:layout_height="48dp"

        android:layout_marginTop="@dimen/qs_media_action_margin"

        android:layout_marginStart="@dimen/qs_media_action_spacing"

        android:layout_marginEnd="@dimen/qs_media_action_spacing"

        android:layout_marginBottom="@dimen/qs_media_action_margin"
@@ -181,7 +178,6 @@ 
        android:id="@+id/action4"

        android:layout_width="48dp"

        android:layout_height="48dp"

        android:layout_marginTop="@dimen/qs_media_action_margin"

        android:layout_marginStart="@dimen/qs_media_action_spacing"

        android:layout_marginEnd="@dimen/qs_media_padding"

        android:layout_marginBottom="@dimen/qs_media_action_margin"

packages/SystemUI/res/xml/media_recommendation_expanded.xml

+6 −6
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
        android:layout_height="@dimen/qs_aa_media_rec_album_size_expanded"

        app:layout_constraintWidth_max="@dimen/qs_aa_media_rec_album_size_expanded"

        android:layout_marginTop="@dimen/qs_media_padding"

        android:layout_marginBottom="@dimen/qs_aa_media_rec_album_margin"

        android:layout_marginBottom="@dimen/qs_aa_media_rec_album_margin_vert"

        android:layout_marginEnd="@dimen/qs_aa_media_rec_album_margin"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintBottom_toTopOf="@+id/media_horizontal_center_guideline"
@@ -61,7 +61,7 @@ 
        android:layout_height="@dimen/qs_aa_media_rec_album_size_expanded"

        app:layout_constraintWidth_max="@dimen/qs_aa_media_rec_album_size_expanded"

        android:layout_marginTop="@dimen/qs_media_padding"

        android:layout_marginBottom="@dimen/qs_aa_media_rec_album_margin"

        android:layout_marginBottom="@dimen/qs_aa_media_rec_album_margin_vert"

        android:layout_marginEnd="@dimen/qs_aa_media_rec_album_margin"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintBottom_toTopOf="@+id/media_horizontal_center_guideline"
@@ -79,7 +79,7 @@ 
        android:layout_height="@dimen/qs_aa_media_rec_album_size_expanded"

        app:layout_constraintWidth_max="@dimen/qs_aa_media_rec_album_size_expanded"

        android:layout_marginTop="@dimen/qs_media_padding"

        android:layout_marginBottom="@dimen/qs_aa_media_rec_album_margin"

        android:layout_marginBottom="@dimen/qs_aa_media_rec_album_margin_vert"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintBottom_toTopOf="@+id/media_horizontal_center_guideline"

        app:layout_constraintStart_toEndOf="@id/media_cover2_container"
@@ -95,7 +95,7 @@ 
        android:layout_width="0dp"

        android:layout_height="@dimen/qs_aa_media_rec_album_size_expanded"

        app:layout_constraintWidth_max="@dimen/qs_aa_media_rec_album_size_expanded"

        android:layout_marginTop="@dimen/qs_aa_media_rec_album_margin"

        android:layout_marginTop="@dimen/qs_aa_media_rec_album_margin_vert"

        android:layout_marginBottom="@dimen/qs_media_padding"

        android:layout_marginEnd="@dimen/qs_aa_media_rec_album_margin"

        app:layout_constraintTop_toBottomOf="@+id/media_horizontal_center_guideline"
@@ -113,7 +113,7 @@ 
        android:layout_width="0dp"

        android:layout_height="@dimen/qs_aa_media_rec_album_size_expanded"

        app:layout_constraintWidth_max="@dimen/qs_aa_media_rec_album_size_expanded"

        android:layout_marginTop="@dimen/qs_aa_media_rec_album_margin"

        android:layout_marginTop="@dimen/qs_aa_media_rec_album_margin_vert"

        android:layout_marginBottom="@dimen/qs_media_padding"

        android:layout_marginEnd="@dimen/qs_aa_media_rec_album_margin"

        app:layout_constraintTop_toBottomOf="@+id/media_horizontal_center_guideline"
@@ -131,7 +131,7 @@ 
        android:layout_width="0dp"

        android:layout_height="@dimen/qs_aa_media_rec_album_size_expanded"

        app:layout_constraintWidth_max="@dimen/qs_aa_media_rec_album_size_expanded"

        android:layout_marginTop="@dimen/qs_aa_media_rec_album_margin"

        android:layout_marginTop="@dimen/qs_aa_media_rec_album_margin_vert"

        android:layout_marginBottom="@dimen/qs_media_padding"

        app:layout_constraintTop_toBottomOf="@id/media_horizontal_center_guideline"

        app:layout_constraintBottom_toBottomOf="parent"