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

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

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

Change-Id: I39459ede70ce6764402fe3e0e5e909a7cbbd94b5
This commit is contained in:
TreeHugger Robot
2020-06-29 17:16:08 +00:00
committed by Automerger Merge Worker
parent 08e502f5db 44d6bc8594
commit d263f1a9f3
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -207,8 +207,8 @@
<com.android.internal.widget.CachingIconView <com.android.internal.widget.CachingIconView
android:id="@+id/icon" android:id="@+id/icon"
android:tint="@color/media_primary_text" android:tint="@color/media_primary_text"
android:layout_width="20dp" android:layout_width="@dimen/qs_media_icon_size"
android:layout_height="20dp" /> android:layout_height="@dimen/qs_media_icon_size" />
<!-- Buttons to remove this view when no longer needed --> <!-- Buttons to remove this view when no longer needed -->
<include <include

6
packages/SystemUI/res/values/dimens.xml
View File

@@ -1269,10 +1269,10 @@
<dimen name="qs_media_padding">16dp</dimen> <dimen name="qs_media_padding">16dp</dimen>
<dimen name="qs_media_panel_outer_padding">16dp</dimen> <dimen name="qs_media_panel_outer_padding">16dp</dimen>
<dimen name="qs_media_album_size">52dp</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_center_guideline_padding">10dp</dimen>
<dimen name="qs_seamless_icon_size">20dp</dimen> <dimen name="qs_seamless_icon_size">@dimen/qs_media_icon_size</dimen>
<dimen name="qs_seamless_fallback_icon_size">20dp</dimen> <dimen name="qs_seamless_fallback_icon_size">@dimen/qs_seamless_icon_size</dimen>
<dimen name="qs_seamless_fallback_top_margin">18dp</dimen>
<dimen name="qs_seamless_fallback_end_margin">16dp</dimen> <dimen name="qs_seamless_fallback_end_margin">16dp</dimen>
<dimen name="qqs_media_spacing">16dp</dimen> <dimen name="qqs_media_spacing">16dp</dimen>
<dimen name="qs_footer_horizontal_margin">22dp</dimen> <dimen name="qs_footer_horizontal_margin">22dp</dimen>

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

@@ -19,8 +19,8 @@
xmlns:app="http://schemas.android.com/apk/res-auto"> xmlns:app="http://schemas.android.com/apk/res-auto">
<Constraint <Constraint
android:id="@+id/icon" android:id="@+id/icon"
android:layout_width="16dp" android:layout_width="@dimen/qs_media_icon_size"
android:layout_height="16dp" android:layout_height="@dimen/qs_media_icon_size"
android:layout_marginStart="18dp" android:layout_marginStart="18dp"
app:layout_constraintTop_toTopOf="@id/app_name" app:layout_constraintTop_toTopOf="@id/app_name"
app:layout_constraintBottom_toBottomOf="@id/app_name" app:layout_constraintBottom_toBottomOf="@id/app_name"
@@ -59,14 +59,14 @@
android:id="@+id/media_seamless_fallback" android:id="@+id/media_seamless_fallback"
android:layout_width="@dimen/qs_seamless_fallback_icon_size" android:layout_width="@dimen/qs_seamless_fallback_icon_size"
android:layout_height="@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_marginEnd="@dimen/qs_seamless_fallback_end_margin"
android:layout_marginStart="@dimen/qs_center_guideline_padding" android:layout_marginStart="@dimen/qs_center_guideline_padding"
android:alpha="0.5" android:alpha="0.5"
android:visibility="gone" android:visibility="gone"
app:layout_constraintHorizontal_bias="1" app:layout_constraintHorizontal_bias="1"
app:layout_constraintEnd_toEndOf="parent" 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_constraintStart_toEndOf="@id/center_vertical_guideline"
/> />

10
packages/SystemUI/res/xml/media_expanded.xml
View File

@@ -19,8 +19,8 @@
xmlns:app="http://schemas.android.com/apk/res-auto"> xmlns:app="http://schemas.android.com/apk/res-auto">
<Constraint <Constraint
android:id="@+id/icon" android:id="@+id/icon"
android:layout_width="16dp" android:layout_width="@dimen/qs_media_icon_size"
android:layout_height="16dp" android:layout_height="@dimen/qs_media_icon_size"
android:layout_marginStart="18dp" android:layout_marginStart="18dp"
app:layout_constraintTop_toTopOf="@id/app_name" app:layout_constraintTop_toTopOf="@id/app_name"
app:layout_constraintBottom_toBottomOf="@id/app_name" app:layout_constraintBottom_toBottomOf="@id/app_name"
@@ -59,14 +59,14 @@
android:id="@+id/media_seamless_fallback" android:id="@+id/media_seamless_fallback"
android:layout_width="@dimen/qs_seamless_fallback_icon_size" android:layout_width="@dimen/qs_seamless_fallback_icon_size"
android:layout_height="@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_marginEnd="@dimen/qs_seamless_fallback_end_margin"
android:layout_marginStart="@dimen/qs_center_guideline_padding" android:layout_marginStart="@dimen/qs_center_guideline_padding"
android:alpha="0.5" android:alpha="0.5"
android:visibility="gone" android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@id/app_name"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="@id/app_name"
app:layout_constraintStart_toEndOf="@id/center_vertical_guideline" app:layout_constraintStart_toEndOf="@id/center_vertical_guideline"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="1" app:layout_constraintHorizontal_bias="1"
/> />