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

Merge "Make corners rounded in dialog_with_icon.xml" into udc-qpr-dev am: 81891aaddd

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

Change-Id: Ic5dcb0b5c730f7226f2fa38d3ee272f66b15e741
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Tetiana Meronyk
2023-06-14 12:35:01 +00:00
committed by Automerger Merge Worker
parent 374af101a1 81891aaddd
commit 5c5094316a
5 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SettingsLib/res/drawable/dialog_btn_filled.xml
View File

@@ -22,12 +22,12 @@
<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="?android:attr/buttonCornerRadius"/> <corners android:radius="@dimen/button_corner_radius"/>
</shape> </shape>
</item> </item>
<item> <item>
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<corners android:radius="?android:attr/buttonCornerRadius"/> <corners android:radius="@dimen/button_corner_radius"/>
<solid android:color="?androidprv:attr/colorAccentPrimary"/> <solid android:color="?androidprv:attr/colorAccentPrimary"/>
<padding android:left="@dimen/dialog_button_horizontal_padding" <padding android:left="@dimen/dialog_button_horizontal_padding"
android:top="@dimen/dialog_button_vertical_padding" android:top="@dimen/dialog_button_vertical_padding"

7
packages/SettingsLib/res/drawable/dialog_btn_outline.xml
View File

@@ -22,16 +22,15 @@
<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="?android:attr/buttonCornerRadius"/> <corners android:radius="@dimen/button_corner_radius"/>
</shape> </shape>
</item> </item>
<item> <item>
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<corners android:radius="?android:attr/buttonCornerRadius"/> <corners android:radius="@dimen/button_corner_radius"/>
<solid android:color="@android:color/transparent"/> <solid android:color="@android:color/transparent"/>
<stroke android:color="?androidprv:attr/colorAccentPrimaryVariant" <stroke android:color="?androidprv:attr/colorAccentPrimaryVariant"
android:width="1dp" android:width="1dp"/>
/>
<padding android:left="@dimen/dialog_button_horizontal_padding" <padding android:left="@dimen/dialog_button_horizontal_padding"
android:top="@dimen/dialog_button_vertical_padding" android:top="@dimen/dialog_button_vertical_padding"
android:right="@dimen/dialog_button_horizontal_padding" android:right="@dimen/dialog_button_horizontal_padding"

5
packages/SettingsLib/res/layout/dialog_with_icon.xml
View File

@@ -63,7 +63,6 @@
android:id="@+id/button_cancel" android:id="@+id/button_cancel"
style="@style/DialogButtonNegative" style="@style/DialogButtonNegative"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:buttonCornerRadius="28dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:visibility="gone"/> android:visibility="gone"/>
@@ -78,7 +77,6 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="@style/DialogButtonNegative" style="@style/DialogButtonNegative"
android:buttonCornerRadius="40dp"
android:visibility="gone"/> android:visibility="gone"/>
<Space <Space
@@ -92,8 +90,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="@style/DialogButtonPositive" style="@style/DialogButtonPositive"
android:visibility="gone" android:visibility="gone"/>
/>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>

1
packages/SettingsLib/res/values/dimens.xml
View File

@@ -124,4 +124,5 @@
<dimen name="dialog_bottom_padding">18dp</dimen> <dimen name="dialog_bottom_padding">18dp</dimen>
<dimen name="dialog_side_padding">24dp</dimen> <dimen name="dialog_side_padding">24dp</dimen>
<dimen name="dialog_button_bar_top_padding">32dp</dimen> <dimen name="dialog_button_bar_top_padding">32dp</dimen>
<dimen name="button_corner_radius">28dp</dimen>
</resources> </resources>

2
packages/SettingsLib/res/values/styles.xml
View File

@@ -93,7 +93,6 @@
</style> </style>
<style name="DialogButtonPositive"> <style name="DialogButtonPositive">
<item name="android:buttonCornerRadius">0dp</item>
<item name="android:background">@drawable/dialog_btn_filled</item> <item name="android:background">@drawable/dialog_btn_filled</item>
<item name="android:textColor">?androidprv:attr/textColorOnAccent</item> <item name="android:textColor">?androidprv:attr/textColorOnAccent</item>
<item name="android:textSize">14sp</item> <item name="android:textSize">14sp</item>
@@ -104,7 +103,6 @@
</style> </style>
<style name="DialogButtonNegative"> <style name="DialogButtonNegative">
<item name="android:buttonCornerRadius">28dp</item>
<item name="android:background">@drawable/dialog_btn_outline</item> <item name="android:background">@drawable/dialog_btn_outline</item>
<item name="android:textColor">?android:attr/textColorPrimary</item> <item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="android:textSize">14sp</item> <item name="android:textSize">14sp</item>