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

Commit 4732c094 authored by Beth Thibodeau's avatar Beth Thibodeau Committed by Automerger Merge Worker
Browse files

Merge "Adjust size of action buttons" into sc-dev am: f3bb0f28 

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

Change-Id: I4e67f486d07b5c2ed25d0dc587338968b4bfcb00
parents 88a6bc08 f3bb0f28

packages/SystemUI/res/layout/media_view.xml

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:orientation="horizontal"

        app:layout_constraintGuide_percent="0.5" />

        app:layout_constraintGuide_begin="48dp" />



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

    <FrameLayout

packages/SystemUI/res/values/styles.xml

+2 −0
Original line number Diff line number Diff line
@@ -637,6 +637,8 @@ 
        <item name="android:background">@drawable/qs_media_light_source</item>

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

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

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

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

    </style>



    <style name="MediaPlayer.OutlineButton">

packages/SystemUI/res/xml/media_collapsed.xml

+5 −13
Original line number Diff line number Diff line
@@ -40,10 +40,7 @@ 
        app:layout_constrainedWidth="true"

        app:layout_constraintWidth_min="48dp"

        app:layout_constraintHeight_min="48dp"

        android:paddingTop="@dimen/qs_media_padding"

        android:paddingEnd="@dimen/qs_media_padding"

        android:layout_marginStart="@dimen/qs_center_guideline_padding"

        android:layout_marginBottom="4dp"

        />



    <Constraint
@@ -125,10 +122,9 @@ 
    <Constraint

        android:id="@+id/action0"

        android:layout_width="48dp"

        android:layout_height="48dp"

        android:layout_height="56dp"

        android:layout_marginStart="@dimen/qs_media_padding"

        android:layout_marginEnd="@dimen/qs_media_action_spacing"

        android:layout_marginTop="@dimen/qs_media_action_spacing"

        android:visibility="gone"

        app:layout_constraintHorizontal_chainStyle="packed"

        app:layout_constraintTop_toBottomOf="@id/center_horizontal_guideline"
@@ -142,10 +138,9 @@ 
    <Constraint

        android:id="@+id/action1"

        android:layout_width="48dp"

        android:layout_height="48dp"

        android:layout_height="56dp"

        android:layout_marginStart="@dimen/qs_media_action_spacing"

        android:layout_marginEnd="@dimen/qs_media_action_spacing"

        android:layout_marginTop="@dimen/qs_media_action_spacing"

        app:layout_constraintTop_toBottomOf="@id/center_horizontal_guideline"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintLeft_toRightOf="@id/action0"
@@ -156,10 +151,9 @@ 
    <Constraint

        android:id="@+id/action2"

        android:layout_width="48dp"

        android:layout_height="48dp"

        android:layout_height="56dp"

        android:layout_marginStart="@dimen/qs_media_action_spacing"

        android:layout_marginEnd="@dimen/qs_media_action_spacing"

        android:layout_marginTop="@dimen/qs_media_action_spacing"

        app:layout_constraintTop_toBottomOf="@id/center_horizontal_guideline"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintLeft_toRightOf="@id/action1"
@@ -170,10 +164,9 @@ 
    <Constraint

        android:id="@+id/action3"

        android:layout_width="48dp"

        android:layout_height="48dp"

        android:layout_height="56dp"

        android:layout_marginStart="@dimen/qs_media_action_spacing"

        android:layout_marginEnd="@dimen/qs_media_action_spacing"

        android:layout_marginTop="@dimen/qs_media_action_spacing"

        app:layout_constraintTop_toBottomOf="@id/center_horizontal_guideline"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintLeft_toRightOf="@id/action2"
@@ -184,11 +177,10 @@ 
    <Constraint

        android:id="@+id/action4"

        android:layout_width="48dp"

        android:layout_height="48dp"

        android:layout_height="56dp"

        android:layout_marginStart="@dimen/qs_media_action_spacing"

        android:layout_marginEnd="@dimen/qs_media_padding"

        android:visibility="gone"

        android:layout_marginTop="@dimen/qs_media_action_spacing"

        app:layout_constraintHorizontal_chainStyle="packed"

        app:layout_constraintTop_toBottomOf="@id/center_horizontal_guideline"

        app:layout_constraintBottom_toBottomOf="parent"