diff options
5 files changed, 7 insertions, 12 deletions
diff --git a/packages/SettingsLib/res/drawable/dialog_btn_filled.xml b/packages/SettingsLib/res/drawable/dialog_btn_filled.xml index 14cb1de9fa2d..0614f9dbff8c 100644 --- a/packages/SettingsLib/res/drawable/dialog_btn_filled.xml +++ b/packages/SettingsLib/res/drawable/dialog_btn_filled.xml @@ -22,12 +22,12 @@ <item android:id="@android:id/mask"> <shape android:shape="rectangle"> <solid android:color="@android:color/white"/> - <corners android:radius="?android:attr/buttonCornerRadius"/> + <corners android:radius="@dimen/button_corner_radius"/> </shape> </item> <item> <shape android:shape="rectangle"> - <corners android:radius="?android:attr/buttonCornerRadius"/> + <corners android:radius="@dimen/button_corner_radius"/> <solid android:color="?androidprv:attr/colorAccentPrimary"/> <padding android:left="@dimen/dialog_button_horizontal_padding" android:top="@dimen/dialog_button_vertical_padding" diff --git a/packages/SettingsLib/res/drawable/dialog_btn_outline.xml b/packages/SettingsLib/res/drawable/dialog_btn_outline.xml index 1e7775980243..a920b50585ae 100644 --- a/packages/SettingsLib/res/drawable/dialog_btn_outline.xml +++ b/packages/SettingsLib/res/drawable/dialog_btn_outline.xml @@ -22,16 +22,15 @@ <item android:id="@android:id/mask"> <shape android:shape="rectangle"> <solid android:color="@android:color/white"/> - <corners android:radius="?android:attr/buttonCornerRadius"/> + <corners android:radius="@dimen/button_corner_radius"/> </shape> </item> <item> <shape android:shape="rectangle"> - <corners android:radius="?android:attr/buttonCornerRadius"/> + <corners android:radius="@dimen/button_corner_radius"/> <solid android:color="@android:color/transparent"/> <stroke android:color="?androidprv:attr/colorAccentPrimaryVariant" - android:width="1dp" - /> + android:width="1dp"/> <padding android:left="@dimen/dialog_button_horizontal_padding" android:top="@dimen/dialog_button_vertical_padding" android:right="@dimen/dialog_button_horizontal_padding" diff --git a/packages/SettingsLib/res/layout/dialog_with_icon.xml b/packages/SettingsLib/res/layout/dialog_with_icon.xml index 54f8096b87bf..57c72c1cce44 100644 --- a/packages/SettingsLib/res/layout/dialog_with_icon.xml +++ b/packages/SettingsLib/res/layout/dialog_with_icon.xml @@ -64,7 +64,6 @@ android:id="@+id/button_cancel" style="@style/DialogButtonNegative" android:layout_width="wrap_content" - android:buttonCornerRadius="28dp" android:layout_height="wrap_content" android:visibility="gone"/> @@ -79,7 +78,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/DialogButtonNegative" - android:buttonCornerRadius="40dp" android:visibility="gone"/> <Space @@ -93,8 +91,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/DialogButtonPositive" - android:visibility="gone" - /> + android:visibility="gone"/> </LinearLayout> </LinearLayout> </ScrollView> diff --git a/packages/SettingsLib/res/values/dimens.xml b/packages/SettingsLib/res/values/dimens.xml index 91549d73dfdb..07854bd3e5d8 100644 --- a/packages/SettingsLib/res/values/dimens.xml +++ b/packages/SettingsLib/res/values/dimens.xml @@ -124,4 +124,5 @@ <dimen name="dialog_bottom_padding">18dp</dimen> <dimen name="dialog_side_padding">24dp</dimen> <dimen name="dialog_button_bar_top_padding">32dp</dimen> + <dimen name="button_corner_radius">28dp</dimen> </resources> diff --git a/packages/SettingsLib/res/values/styles.xml b/packages/SettingsLib/res/values/styles.xml index 4ac4aae8f2ab..1249c6b71b55 100644 --- a/packages/SettingsLib/res/values/styles.xml +++ b/packages/SettingsLib/res/values/styles.xml @@ -93,7 +93,6 @@ </style> <style name="DialogButtonPositive"> - <item name="android:buttonCornerRadius">0dp</item> <item name="android:background">@drawable/dialog_btn_filled</item> <item name="android:textColor">?androidprv:attr/textColorOnAccent</item> <item name="android:textSize">14sp</item> @@ -104,7 +103,6 @@ </style> <style name="DialogButtonNegative"> - <item name="android:buttonCornerRadius">28dp</item> <item name="android:background">@drawable/dialog_btn_outline</item> <item name="android:textColor">?android:attr/textColorPrimary</item> <item name="android:textSize">14sp</item> |