diff options
author | 2019-02-05 17:45:41 -0500 | |
---|---|---|
committer | 2019-02-05 18:42:17 -0500 | |
commit | db156f3a4ef1e43531521d1afe2bfee078761285 (patch) | |
tree | fe51005910cc8efe6b6ea3fc225a16bcd5f70d73 | |
parent | 55593a983fa6b5ee0c85a9c71d4dc66d65b3f8d6 (diff) |
Add config_bottomDialogCornerRadius.
- Set this value and config_dialogCornerRadius for icon shape overlays.
- Update the corners of the autofill dialog to use this value.
- TODO use this value for sharesheet.
Bug: 123881839
Test: make
Change-Id: I445a7477854756b07bed8cfc34fee49763d2ec8b
5 files changed, 15 insertions, 1 deletions
diff --git a/core/res/res/drawable/autofill_dataset_picker_background.xml b/core/res/res/drawable/autofill_dataset_picker_background.xml index b5617e177feb..d57497037616 100644 --- a/core/res/res/drawable/autofill_dataset_picker_background.xml +++ b/core/res/res/drawable/autofill_dataset_picker_background.xml @@ -16,7 +16,7 @@ <inset xmlns:android="http://schemas.android.com/apk/res/android"> <shape android:shape="rectangle"> - <corners android:radius="2dp" /> + <corners android:radius="@dimen/config_bottomDialogCornerRadius" /> <solid android:color="?attr/colorBackground" /> </shape> </inset> diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index d65ef03e98e0..9e34441cc794 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -3660,6 +3660,8 @@ <dimen name="config_dialogCornerRadius">2dp</dimen> <!-- Corner radius of system buttons --> <dimen name="config_buttonCornerRadius">@dimen/control_corner_material</dimen> + <!-- Corner radius for bottom sheet system dialogs --> + <dimen name="config_bottomDialogCornerRadius">@dimen/config_dialogCornerRadius</dimen> <!-- Corner radius of system progress bars --> <dimen name="config_progressBarCornerRadius">@dimen/progress_bar_corner_material</dimen> <!-- Controls whether system buttons use all caps for text --> diff --git a/packages/overlays/IconShapeRoundedRectOverlay/res/values/config.xml b/packages/overlays/IconShapeRoundedRectOverlay/res/values/config.xml index 138c283b9a24..c5bb5e9bb885 100644 --- a/packages/overlays/IconShapeRoundedRectOverlay/res/values/config.xml +++ b/packages/overlays/IconShapeRoundedRectOverlay/res/values/config.xml @@ -21,6 +21,10 @@ <string name="config_icon_mask" translatable="false">"M50,0L88,0 C94.4,0 100,5.4 100 12 L100,88 C100,94.6 94.6 100 88 100 L12,100 C5.4,100 0,94.6 0,88 L0 12 C0 5.4 5.4 0 12 0 L50,0 Z"</string> <!-- Flag indicating whether round icons should be parsed from the application manifest. --> <bool name="config_useRoundIcon">false</bool> + <!-- Corner radius of system dialogs --> + <dimen name="config_dialogCornerRadius">2dp</dimen> + <!-- Corner radius for bottom sheet system dialogs --> + <dimen name="config_bottomDialogCornerRadius">4dp</dimen> </resources> diff --git a/packages/overlays/IconShapeSquircleOverlay/res/values/config.xml b/packages/overlays/IconShapeSquircleOverlay/res/values/config.xml index eaf7de3b153d..7692aa6b5164 100644 --- a/packages/overlays/IconShapeSquircleOverlay/res/values/config.xml +++ b/packages/overlays/IconShapeSquircleOverlay/res/values/config.xml @@ -21,6 +21,10 @@ <string name="config_icon_mask" translatable="false">"M50,0 C10,0 0,10 0,50 0,90 10,100 50,100 90,100 100,90 100,50 100,10 90,0 50,0 Z"</string> <!-- Flag indicating whether round icons should be parsed from the application manifest. --> <bool name="config_useRoundIcon">false</bool> + <!-- Corner radius of system dialogs --> + <dimen name="config_dialogCornerRadius">4dp</dimen> + <!-- Corner radius for bottom sheet system dialogs --> + <dimen name="config_bottomDialogCornerRadius">8dp</dimen> </resources> diff --git a/packages/overlays/IconShapeTeardropOverlay/res/values/config.xml b/packages/overlays/IconShapeTeardropOverlay/res/values/config.xml index 818e696577e9..b6ee412e5916 100644 --- a/packages/overlays/IconShapeTeardropOverlay/res/values/config.xml +++ b/packages/overlays/IconShapeTeardropOverlay/res/values/config.xml @@ -21,6 +21,10 @@ <string name="config_icon_mask" translatable="false">"M50,0 C77.6,0 100,22.4 100,50 L100,88 C100,94.6 94.6,100 88,100 L50,100 C22.4 100 0 77.6 0 50C0 22.4 22.4 0 50 0 Z"</string> <!-- Flag indicating whether round icons should be parsed from the application manifest. --> <bool name="config_useRoundIcon">false</bool> + <!-- Corner radius of system dialogs --> + <dimen name="config_dialogCornerRadius">8dp</dimen> + <!-- Corner radius for bottom sheet system dialogs --> + <dimen name="config_bottomDialogCornerRadius">16dp</dimen> </resources> |