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

Commit 0de91091 authored by Beth Thibodeau's avatar Beth Thibodeau Committed by Automerger Merge Worker
Browse files

Merge "Fix issues with media control size" into sc-dev am: f2dc063d 

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

Change-Id: Id72d8fca0ffa7f794fd750b24939ffa6b05db6ad
parents 1874e9ce f2dc063d

packages/SystemUI/res/layout/media_smartspace_recommendations.xml

+4 −4
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ 
    <TextView

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginTop="20dp"

        android:layout_marginTop="@dimen/qs_media_padding"

        android:layout_marginStart="@dimen/qs_media_padding"

        android:layout_marginEnd="@dimen/qs_media_padding"

        android:id="@+id/remove_text"
@@ -150,7 +150,6 @@ 
        android:layout_marginStart="@dimen/qs_media_padding"

        android:layout_marginEnd="@dimen/qs_media_info_spacing"

        android:layout_marginBottom="@dimen/qs_media_padding"

        android:layout_marginTop="6dp"

        app:layout_constrainedWidth="true"

        app:layout_constraintWidth_min="48dp"

        app:layout_constraintHeight_min="48dp"
@@ -164,6 +163,7 @@ 
            android:id="@+id/settings_text"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="center|bottom"

            style="@style/MediaPlayer.OutlineButton"

            android:text="@string/controls_media_settings_button" />

    </FrameLayout>
@@ -176,7 +176,6 @@ 
        android:layout_marginStart="@dimen/qs_media_info_spacing"

        android:layout_marginEnd="@dimen/qs_media_info_spacing"

        android:layout_marginBottom="@dimen/qs_media_padding"

        android:layout_marginTop="6dp"

        app:layout_constrainedWidth="true"

        app:layout_constraintWidth_min="48dp"

        app:layout_constraintHeight_min="48dp"
@@ -188,6 +187,7 @@ 
        <TextView

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="center|bottom"

            style="@style/MediaPlayer.OutlineButton"

            android:text="@string/cancel" />

    </FrameLayout>
@@ -200,7 +200,6 @@ 
        android:layout_marginStart="@dimen/qs_media_info_spacing"

        android:layout_marginEnd="@dimen/qs_media_padding"

        android:layout_marginBottom="@dimen/qs_media_padding"

        android:layout_marginTop="6dp"

        app:layout_constrainedWidth="true"

        app:layout_constraintWidth_min="48dp"

        app:layout_constraintHeight_min="48dp"
@@ -212,6 +211,7 @@ 
        <TextView

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="center|bottom"

            style="@style/MediaPlayer.OutlineButton"

            android:text="@string/controls_media_dismiss_button"

        />

packages/SystemUI/res/layout/media_view.xml

+9 −7
Original line number Diff line number Diff line
@@ -135,7 +135,8 @@ 
        android:forceHasOverlappingRendering="false">

        <LinearLayout

            android:layout_width="wrap_content"

            android:layout_height="@dimen/qs_seamless_height"

            android:layout_height="wrap_content"

            android:minHeight="@dimen/qs_seamless_height"

            android:theme="@style/MediaPlayer.SolidButton"

            android:background="@drawable/qs_media_seamless_background"

            android:orientation="horizontal"
@@ -153,11 +154,12 @@ 
                android:layout_height="wrap_content"

                android:layout_gravity="center_vertical"

                android:layout_marginStart="4dp"

                android:fontFamily="@*android:string/config_headlineFontFamily"

                android:fontFamily="@*android:string/config_headlineFontFamilyMedium"

                android:singleLine="true"

                android:text="@*android:string/ext_media_seamless_action"

                android:textDirection="locale"

                android:textSize="12sp" />

                android:textSize="12sp"

                android:lineHeight="16sp" />

        </LinearLayout>

    </LinearLayout>
@@ -215,7 +217,7 @@ 
    <TextView

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginTop="20dp"

        android:layout_marginTop="@dimen/qs_media_padding"

        android:layout_marginStart="@dimen/qs_media_padding"

        android:layout_marginEnd="@dimen/qs_media_padding"

        android:id="@+id/remove_text"
@@ -238,7 +240,6 @@ 
        android:layout_marginStart="@dimen/qs_media_padding"

        android:layout_marginEnd="@dimen/qs_media_info_spacing"

        android:layout_marginBottom="@dimen/qs_media_padding"

        android:layout_marginTop="6dp"

        app:layout_constrainedWidth="true"

        app:layout_constraintWidth_min="48dp"

        app:layout_constraintHeight_min="48dp"
@@ -252,6 +253,7 @@ 
            android:id="@+id/settings_text"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="center|bottom"

            style="@style/MediaPlayer.OutlineButton"

            android:text="@string/controls_media_settings_button" />

    </FrameLayout>
@@ -264,7 +266,6 @@ 
        android:layout_marginStart="@dimen/qs_media_info_spacing"

        android:layout_marginEnd="@dimen/qs_media_info_spacing"

        android:layout_marginBottom="@dimen/qs_media_padding"

        android:layout_marginTop="6dp"

        app:layout_constrainedWidth="true"

        app:layout_constraintWidth_min="48dp"

        app:layout_constraintHeight_min="48dp"
@@ -276,6 +277,7 @@ 
        <TextView

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="center|bottom"

            style="@style/MediaPlayer.OutlineButton"

            android:text="@string/cancel" />

    </FrameLayout>
@@ -288,7 +290,6 @@ 
        android:layout_marginStart="@dimen/qs_media_info_spacing"

        android:layout_marginEnd="@dimen/qs_media_padding"

        android:layout_marginBottom="@dimen/qs_media_padding"

        android:layout_marginTop="6dp"

        app:layout_constrainedWidth="true"

        app:layout_constraintWidth_min="48dp"

        app:layout_constraintHeight_min="48dp"
@@ -300,6 +301,7 @@ 
        <TextView

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="center|bottom"

            style="@style/MediaPlayer.OutlineButton"

            android:text="@string/controls_media_dismiss_button"

        />

packages/SystemUI/res/values/dimens.xml

+2 −2
Original line number Diff line number Diff line
@@ -1281,7 +1281,7 @@ 
    <dimen name="qs_media_action_spacing">4dp</dimen>

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

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

    <dimen name="qs_seamless_icon_size">16dp</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_margin">20dp</dimen>

    <dimen name="qs_footer_horizontal_margin">22dp</dimen>
@@ -1291,7 +1291,7 @@ 
    <dimen name="qs_media_disabled_seekbar_vertical_padding">36dp</dimen>



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

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

    <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_margin">8dp</dimen>

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