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

Merge "Match rounded corners in QSDetail and QSFooter" into sc-dev

Browse Source
This commit is contained in:
Fabian Kozynski
2021-04-14 13:09:26 +00:00
committed by Android (Google) Code Review
parent 42cef834c7 cac316e6ac
commit aaeacb8093
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/res/drawable/qs_detail_background.xml
View File

@@ -18,7 +18,7 @@ Copyright (C) 2014 The Android Open Source Project
<inset> <inset>
<shape> <shape>
<solid android:color="@color/qs_detail_transition"/> <solid android:color="@color/qs_detail_transition"/>
<corners android:radius="?android:attr/dialogCornerRadius" /> <corners android:radius="@dimen/qs_footer_action_corner_radius" />
</shape> </shape>
</inset> </inset>
</item> </item>
@@ -26,7 +26,7 @@ Copyright (C) 2014 The Android Open Source Project
<inset> <inset>
<shape> <shape>
<solid android:color="?android:attr/colorBackgroundFloating"/> <solid android:color="?android:attr/colorBackgroundFloating"/>
<corners android:radius="?android:attr/dialogCornerRadius" /> <corners android:radius="@dimen/qs_footer_action_corner_radius" />
</shape> </shape>
</inset> </inset>
</item> </item>

4
packages/SystemUI/res/drawable/qs_footer_action_chip_background.xml
View File

@@ -23,14 +23,14 @@
<item android:id="@android:id/mask"> <item android:id="@android:id/mask">
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="@android:color/white"/> <solid android:color="@android:color/white"/>
<corners android:radius="@dimen/screenshot_button_corner_radius"/> <corners android:radius="@dimen/qs_footer_action_corner_radius"/>
</shape> </shape>
</item> </item>
<item> <item>
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<stroke android:width="1dp" android:color="@color/qs_footer_action_border"/> <stroke android:width="1dp" android:color="@color/qs_footer_action_border"/>
<solid android:color="@android:color/transparent"/> <solid android:color="@android:color/transparent"/>
<corners android:radius="@dimen/screenshot_button_corner_radius"/> <corners android:radius="@dimen/qs_footer_action_corner_radius"/>
</shape> </shape>
</item> </item>
</ripple> </ripple>

4
packages/SystemUI/res/drawable/qs_footer_action_chip_background_borderless.xml
View File

@@ -22,13 +22,13 @@
<item android:id="@android:id/mask"> <item android:id="@android:id/mask">
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="@android:color/white"/> <solid android:color="@android:color/white"/>
<corners android:radius="@dimen/screenshot_button_corner_radius"/> <corners android:radius="@dimen/qs_footer_action_corner_radius"/>
</shape> </shape>
</item> </item>
<item> <item>
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="@android:color/transparent"/> <solid android:color="@android:color/transparent"/>
<corners android:radius="@dimen/screenshot_button_corner_radius"/> <corners android:radius="@dimen/qs_footer_action_corner_radius"/>
</shape> </shape>
</item> </item>
</ripple> </ripple>

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

@@ -412,6 +412,8 @@
<!-- The size of each of the icon buttons in the QS footer --> <!-- The size of each of the icon buttons in the QS footer -->
<dimen name="qs_footer_action_button_size">@dimen/qs_footer_height</dimen> <dimen name="qs_footer_action_button_size">@dimen/qs_footer_height</dimen>
<dimen name="qs_footer_action_corner_radius">20dp</dimen>
<!-- (48dp - 44dp) / 2 --> <!-- (48dp - 44dp) / 2 -->
<dimen name="qs_footer_action_inset">2dp</dimen> <dimen name="qs_footer_action_inset">2dp</dimen>