Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Adjust size of action buttons" into sc-dev

Browse Source
This commit is contained in:
Beth Thibodeau
2021-05-10 16:23:18 +00:00
committed by Android (Google) Code Review
parent c96669eac2 34d64788a1
commit f3bb0f2861
3 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/res/layout/media_view.xml
View File

@@ -40,7 +40,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" 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 --> <!-- As per Material Design on Biderectionality, this is forced to LTR in code -->
<FrameLayout <FrameLayout

2
packages/SystemUI/res/values/styles.xml
View File

@@ -637,6 +637,8 @@
<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:scaleType">fitCenter</item>
</style> </style>
<style name="MediaPlayer.OutlineButton"> <style name="MediaPlayer.OutlineButton">

18
packages/SystemUI/res/xml/media_collapsed.xml
View File

@@ -40,10 +40,7 @@
app:layout_constrainedWidth="true" app:layout_constrainedWidth="true"
app:layout_constraintWidth_min="48dp" app:layout_constraintWidth_min="48dp"
app:layout_constraintHeight_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_marginStart="@dimen/qs_center_guideline_padding"
android:layout_marginBottom="4dp"
/> />
<Constraint <Constraint
@@ -125,10 +122,9 @@
<Constraint <Constraint
android:id="@+id/action0" android:id="@+id/action0"
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="48dp" android:layout_height="56dp"
android:layout_marginStart="@dimen/qs_media_padding" android:layout_marginStart="@dimen/qs_media_padding"
android:layout_marginEnd="@dimen/qs_media_action_spacing" android:layout_marginEnd="@dimen/qs_media_action_spacing"
android:layout_marginTop="@dimen/qs_media_action_spacing"
android:visibility="gone" android:visibility="gone"
app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintTop_toBottomOf="@id/center_horizontal_guideline" app:layout_constraintTop_toBottomOf="@id/center_horizontal_guideline"
@@ -142,10 +138,9 @@
<Constraint <Constraint
android:id="@+id/action1" android:id="@+id/action1"
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="48dp" android:layout_height="56dp"
android:layout_marginStart="@dimen/qs_media_action_spacing" android:layout_marginStart="@dimen/qs_media_action_spacing"
android:layout_marginEnd="@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_constraintTop_toBottomOf="@id/center_horizontal_guideline"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toRightOf="@id/action0" app:layout_constraintLeft_toRightOf="@id/action0"
@@ -156,10 +151,9 @@
<Constraint <Constraint
android:id="@+id/action2" android:id="@+id/action2"
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="48dp" android:layout_height="56dp"
android:layout_marginStart="@dimen/qs_media_action_spacing" android:layout_marginStart="@dimen/qs_media_action_spacing"
android:layout_marginEnd="@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_constraintTop_toBottomOf="@id/center_horizontal_guideline"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toRightOf="@id/action1" app:layout_constraintLeft_toRightOf="@id/action1"
@@ -170,10 +164,9 @@
<Constraint <Constraint
android:id="@+id/action3" android:id="@+id/action3"
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="48dp" android:layout_height="56dp"
android:layout_marginStart="@dimen/qs_media_action_spacing" android:layout_marginStart="@dimen/qs_media_action_spacing"
android:layout_marginEnd="@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_constraintTop_toBottomOf="@id/center_horizontal_guideline"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toRightOf="@id/action2" app:layout_constraintLeft_toRightOf="@id/action2"
@@ -184,11 +177,10 @@
<Constraint <Constraint
android:id="@+id/action4" android:id="@+id/action4"
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="48dp" android:layout_height="56dp"
android:layout_marginStart="@dimen/qs_media_action_spacing" android:layout_marginStart="@dimen/qs_media_action_spacing"
android:layout_marginEnd="@dimen/qs_media_padding" android:layout_marginEnd="@dimen/qs_media_padding"
android:visibility="gone" android:visibility="gone"
android:layout_marginTop="@dimen/qs_media_action_spacing"
app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintTop_toBottomOf="@id/center_horizontal_guideline" app:layout_constraintTop_toBottomOf="@id/center_horizontal_guideline"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"