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

Commit c523ddb2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Make icon sizes consistent" into rvc-dev am: 44d6bc85 

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

Change-Id: I696dd4869af72ecc753d539623f74a0c1ace5a1b
parents bcf30c63 44d6bc85

packages/SystemUI/res/layout/media_view.xml

+2 −2
Original line number Diff line number Diff line
@@ -207,8 +207,8 @@ 
    <com.android.internal.widget.CachingIconView

        android:id="@+id/icon"

        android:tint="@color/media_primary_text"

        android:layout_width="20dp"

        android:layout_height="20dp" />

        android:layout_width="@dimen/qs_media_icon_size"

        android:layout_height="@dimen/qs_media_icon_size" />



    <!-- Buttons to remove this view when no longer needed -->

    <include

packages/SystemUI/res/values/dimens.xml

+3 −3
Original line number Diff line number Diff line
@@ -1269,10 +1269,10 @@ 
    <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_media_icon_size">16dp</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>

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

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

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

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

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

packages/SystemUI/res/xml/media_collapsed.xml

+4 −4
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ 
    xmlns:app="http://schemas.android.com/apk/res-auto">

    <Constraint

        android:id="@+id/icon"

        android:layout_width="16dp"

        android:layout_height="16dp"

        android:layout_width="@dimen/qs_media_icon_size"

        android:layout_height="@dimen/qs_media_icon_size"

        android:layout_marginStart="18dp"

        app:layout_constraintTop_toTopOf="@id/app_name"

        app:layout_constraintBottom_toBottomOf="@id/app_name"
@@ -59,14 +59,14 @@ 
        android:id="@+id/media_seamless_fallback"

        android:layout_width="@dimen/qs_seamless_fallback_icon_size"

        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_constraintTop_toTopOf="@id/app_name"

        app:layout_constraintBottom_toBottomOf="@id/app_name"

        app:layout_constraintStart_toEndOf="@id/center_vertical_guideline"

        />

packages/SystemUI/res/xml/media_expanded.xml

+5 −5
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ 
    xmlns:app="http://schemas.android.com/apk/res-auto">

    <Constraint

        android:id="@+id/icon"

        android:layout_width="16dp"

        android:layout_height="16dp"

        android:layout_width="@dimen/qs_media_icon_size"

        android:layout_height="@dimen/qs_media_icon_size"

        android:layout_marginStart="18dp"

        app:layout_constraintTop_toTopOf="@id/app_name"

        app:layout_constraintBottom_toBottomOf="@id/app_name"
@@ -59,14 +59,14 @@ 
        android:id="@+id/media_seamless_fallback"

        android:layout_width="@dimen/qs_seamless_fallback_icon_size"

        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_constraintTop_toTopOf="@id/app_name"

        app:layout_constraintBottom_toBottomOf="@id/app_name"

        app:layout_constraintStart_toEndOf="@id/center_vertical_guideline"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintHorizontal_bias="1"

        />