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

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

Merge "Adjust media layout to spec" into sc-dev

parents 32fe72cf 1781ae29

packages/SystemUI/res/color/media_player_solid_button_bg.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -17,5 +17,5 @@ 




<selector xmlns:android="http://schemas.android.com/apk/res/android"

<selector xmlns:android="http://schemas.android.com/apk/res/android"

          xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">

          xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">

    <item android:color="?androidprv:attr/colorAccentTertiary"/>

    <item android:color="?androidprv:attr/colorAccentPrimary"/>

</selector>
 
</selector>
 
 No newline at end of file

packages/SystemUI/res/layout/media_smartspace_recommendations.xml

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

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginStart="@dimen/qs_media_padding"

        android:layout_marginStart="@dimen/qs_media_padding"

        android:layout_marginEnd="@dimen/qs_media_info_spacing"

        android:layout_marginEnd="@dimen/qs_media_action_spacing"

        android:layout_marginBottom="@dimen/qs_media_padding"

        android:layout_marginBottom="@dimen/qs_media_padding"

        app:layout_constrainedWidth="true"

        app:layout_constrainedWidth="true"

        app:layout_constraintWidth_min="48dp"

        app:layout_constraintWidth_min="48dp"
@@ -209,8 +209,8 @@ 
        android:background="@drawable/qs_media_light_source"

        android:background="@drawable/qs_media_light_source"

        android:layout_width="0dp"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginStart="@dimen/qs_media_info_spacing"

        android:layout_marginStart="@dimen/qs_media_action_spacing"

        android:layout_marginEnd="@dimen/qs_media_info_spacing"

        android:layout_marginEnd="@dimen/qs_media_action_spacing"

        android:layout_marginBottom="@dimen/qs_media_padding"

        android:layout_marginBottom="@dimen/qs_media_padding"

        app:layout_constrainedWidth="true"

        app:layout_constrainedWidth="true"

        app:layout_constraintWidth_min="48dp"

        app:layout_constraintWidth_min="48dp"
@@ -233,7 +233,7 @@ 
        android:background="@drawable/qs_media_light_source"

        android:background="@drawable/qs_media_light_source"

        android:layout_width="0dp"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginStart="@dimen/qs_media_info_spacing"

        android:layout_marginStart="@dimen/qs_media_action_spacing"

        android:layout_marginEnd="@dimen/qs_media_padding"

        android:layout_marginEnd="@dimen/qs_media_padding"

        android:layout_marginBottom="@dimen/qs_media_padding"

        android:layout_marginBottom="@dimen/qs_media_padding"

        app:layout_constrainedWidth="true"

        app:layout_constrainedWidth="true"

packages/SystemUI/res/layout/media_view.xml

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

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginStart="@dimen/qs_media_padding"

        android:layout_marginStart="@dimen/qs_media_padding"

        android:layout_marginEnd="@dimen/qs_media_info_spacing"

        android:layout_marginEnd="@dimen/qs_media_action_spacing"

        android:layout_marginBottom="@dimen/qs_media_padding"

        android:layout_marginBottom="@dimen/qs_media_padding"

        app:layout_constrainedWidth="true"

        app:layout_constrainedWidth="true"

        app:layout_constraintWidth_min="48dp"

        app:layout_constraintWidth_min="48dp"
@@ -263,8 +263,8 @@ 
        android:background="@drawable/qs_media_light_source"

        android:background="@drawable/qs_media_light_source"

        android:layout_width="0dp"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginStart="@dimen/qs_media_info_spacing"

        android:layout_marginStart="@dimen/qs_media_action_spacing"

        android:layout_marginEnd="@dimen/qs_media_info_spacing"

        android:layout_marginEnd="@dimen/qs_media_action_spacing"

        android:layout_marginBottom="@dimen/qs_media_padding"

        android:layout_marginBottom="@dimen/qs_media_padding"

        app:layout_constrainedWidth="true"

        app:layout_constrainedWidth="true"

        app:layout_constraintWidth_min="48dp"

        app:layout_constraintWidth_min="48dp"
@@ -287,7 +287,7 @@ 
        android:background="@drawable/qs_media_light_source"

        android:background="@drawable/qs_media_light_source"

        android:layout_width="0dp"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginStart="@dimen/qs_media_info_spacing"

        android:layout_marginStart="@dimen/qs_media_action_spacing"

        android:layout_marginEnd="@dimen/qs_media_padding"

        android:layout_marginEnd="@dimen/qs_media_padding"

        android:layout_marginBottom="@dimen/qs_media_padding"

        android:layout_marginBottom="@dimen/qs_media_padding"

        app:layout_constrainedWidth="true"

        app:layout_constrainedWidth="true"

packages/SystemUI/res/values/dimens.xml

+5 −5
Original line number Original line Diff line number Diff line
@@ -1149,7 +1149,7 @@ 
    <dimen name="edge_margin">8dp</dimen>

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





    <!-- The absolute side margins of quick settings -->

    <!-- The absolute side margins of quick settings -->

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

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

    <dimen name="rounded_corner_content_padding">0dp</dimen>

    <dimen name="rounded_corner_content_padding">0dp</dimen>

    <dimen name="nav_content_padding">0dp</dimen>

    <dimen name="nav_content_padding">0dp</dimen>

    <dimen name="nav_quick_scrub_track_edge_padding">24dp</dimen>

    <dimen name="nav_quick_scrub_track_edge_padding">24dp</dimen>
@@ -1278,12 +1278,12 @@ 
    <dimen name="qs_media_album_radius">14dp</dimen>

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

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

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

    <dimen name="qs_media_info_margin">12dp</dimen>

    <dimen name="qs_media_info_margin">12dp</dimen>

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

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

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

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

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

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

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

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

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

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

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

    <dimen name="qs_media_action_margin">12dp</dimen>

    <dimen name="qs_seamless_height">24dp</dimen>

    <dimen name="qs_seamless_height">24dp</dimen>

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

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

    <dimen name="qs_seamless_fallback_icon_size">@dimen/qs_seamless_icon_size</dimen>

    <dimen name="qs_seamless_fallback_icon_size">@dimen/qs_seamless_icon_size</dimen>
@@ -1291,8 +1291,8 @@ 
    <dimen name="qs_footer_horizontal_margin">22dp</dimen>

    <dimen name="qs_footer_horizontal_margin">22dp</dimen>

    <dimen name="qs_media_disabled_seekbar_height">1dp</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_height">2dp</dimen>

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

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

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

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





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

    <!-- 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_collapsed">72dp</dimen>

packages/SystemUI/res/values/styles.xml

+4 −1
Original line number Original line Diff line number Diff line
@@ -642,7 +642,10 @@ 
        <item name="android:background">@drawable/qs_media_light_source</item>

        <item name="android:background">@drawable/qs_media_light_source</item>

        <item name="android:tint">?android:attr/textColorPrimary</item>

        <item name="android:tint">?android:attr/textColorPrimary</item>

        <item name="android:stateListAnimator">@anim/media_button_state_list_animator</item>

        <item name="android:stateListAnimator">@anim/media_button_state_list_animator</item>

        <item name="android:padding">12dp</item>

        <item name="android:paddingTop">8dp</item>

        <item name="android:paddingStart">12dp</item>

        <item name="android:paddingEnd">12dp</item>

        <item name="android:paddingBottom">16dp</item>

        <item name="android:scaleType">centerInside</item>

        <item name="android:scaleType">centerInside</item>

    </style>

    </style>