Merge "Fix droptarget button wrong radius on hover" into udc-dev am: cc79886814
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22627995
Change-Id: I43e9958a2e866308071433c9319cfe1b1719e13d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/res/drawable/drop_target_frame.xml b/res/drawable/drop_target_frame.xml
index 9f04103..0a73b3f 100644
--- a/res/drawable/drop_target_frame.xml
+++ b/res/drawable/drop_target_frame.xml
@@ -17,6 +17,6 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@android:color/transparent" />
- <corners android:radius="80dp" />
+ <corners android:radius="@dimen/drop_target_button_frame_radius" />
<stroke android:width="2dp" android:color="?attr/workspaceAccentColor" />
</shape>
\ No newline at end of file
diff --git a/res/drawable/drop_target_frame_hover.xml b/res/drawable/drop_target_frame_hover.xml
index ddf3a4d..6acffd154 100644
--- a/res/drawable/drop_target_frame_hover.xml
+++ b/res/drawable/drop_target_frame_hover.xml
@@ -17,5 +17,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="?attr/workspaceAccentColor" />
- <corners android:radius="28dp" />
+ <corners android:radius="@dimen/drop_target_button_frame_radius" />
</shape>
\ No newline at end of file
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 923883b..1aa1871 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -233,6 +233,7 @@
<dimen name="drop_target_button_drawable_padding">8dp</dimen>
<dimen name="drop_target_button_drawable_horizontal_padding">16dp</dimen>
<dimen name="drop_target_button_drawable_vertical_padding">8dp</dimen>
+ <dimen name="drop_target_button_frame_radius">80dp</dimen>
<dimen name="drop_target_button_gap">28dp</dimen>
<dimen name="drop_target_button_workspace_edge_gap">0dp</dimen>