PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Reduce the size of individual icons in the icon picker" into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-08-12 17:16:50 +00:00
committed by Android (Google) Code Review
parent 97caf58b33 f1cd68ebd3
commit cc9a03437e
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/values/dimens.xml
View File

@@ -510,9 +510,9 @@
<dimen name="zen_mode_blurb_text_size">16sp</dimen>
<dimen name="zen_mode_icon_list_header_circle_diameter">90dp</dimen>
<dimen name="zen_mode_icon_list_header_icon_size">48dp</dimen>
<dimen name="zen_mode_icon_list_item_size">96dp</dimen>
<dimen name="zen_mode_icon_list_item_circle_diameter">56dp</dimen>
<dimen name="zen_mode_icon_list_item_icon_size">32dp</dimen>
<dimen name="zen_mode_icon_list_item_size">76dp</dimen>
<dimen name="zen_mode_icon_list_item_circle_diameter">52dp</dimen>
<dimen name="zen_mode_icon_list_item_icon_size">28dp</dimen>
<!-- For the items in the CircularIconsPreference (contacts, apps, sound channels). -->
<dimen name="zen_mode_circular_icon_diameter">32dp</dimen>
<dimen name="zen_mode_circular_icon_inner_icon_size">20dp</dimen>

10
src/com/android/settings/notification/modes/IconUtil.java
View File

@@ -82,8 +82,8 @@ class IconUtil {
}
/**
* Returns a variant of the supplied {@code icon} to be used as the header in the icon picker.
* The inner icon is 48x48dp and it's contained in a circle of diameter 90dp.
* Returns a variant of the supplied {@code icon} to be used as the header in the icon picker
* (large icon within large circle, with the "material secondary" color combination).
*/
static Drawable makeIconPickerHeader(@NonNull Context context, Drawable icon) {
return composeIconCircle(
@@ -99,9 +99,9 @@ class IconUtil {
}
/**
* Returns a variant of the supplied {@code icon} to be used as an option in the icon picker.
* The inner icon is 36x36dp and it's contained in a circle of diameter 54dp. It's also set up
* so that selection and pressed states are represented in the color.
* Returns a variant of the supplied {@code icon} to be used as an option in the icon picker
* (small icon in small circle, with "material secondary" colors for the normal state and
* "material primary" colors for the selected state).
*/
static Drawable makeIconPickerItem(@NonNull Context context, @DrawableRes int iconResId) {
return composeIconCircle(