From acf0dad9f7d996b28a3ab034cc7a38ff38929f24 Mon Sep 17 00:00:00 2001 From: Mike Schneider Date: Tue, 27 Jun 2023 16:25:51 +0200 Subject: [PATCH] Tweak AVDs to make them work with the compose androidx.compose.animation:animation-graphics library. The changes do not change the shape animations visually (see video) The reason for the changes are b/289182530 and b/289181643 Bug: 282730134 Test: Visually verified the shapes in SysUI bouncer still work (http://shortn/_Bo2nNcb8KE) Change-Id: I19020fc193814b49d73dd4c9b4262bfc91a82268 --- .../res/drawable/pin_dot_delete_avd.xml | 214 ++++++++---------- .../res/drawable/pin_dot_shape_1_avd.xml | 28 --- .../res/drawable/pin_dot_shape_2_avd.xml | 30 +-- .../res/drawable/pin_dot_shape_3_avd.xml | 30 +-- .../res/drawable/pin_dot_shape_4_avd.xml | 28 --- .../res/drawable/pin_dot_shape_5_avd.xml | 30 +-- .../res/drawable/pin_dot_shape_6_avd.xml | 30 +-- 7 files changed, 97 insertions(+), 293 deletions(-) diff --git a/packages/SystemUI/res/drawable/pin_dot_delete_avd.xml b/packages/SystemUI/res/drawable/pin_dot_delete_avd.xml index 8225dea926cb6..72a03bf54d0ba 100644 --- a/packages/SystemUI/res/drawable/pin_dot_delete_avd.xml +++ b/packages/SystemUI/res/drawable/pin_dot_delete_avd.xml @@ -1,43 +1,58 @@ - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -45,11 +60,11 @@ @@ -58,96 +73,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + \ No newline at end of file diff --git a/packages/SystemUI/res/drawable/pin_dot_shape_1_avd.xml b/packages/SystemUI/res/drawable/pin_dot_shape_1_avd.xml index bb6ba73d8ea97..02abb99bdb27d 100644 --- a/packages/SystemUI/res/drawable/pin_dot_shape_1_avd.xml +++ b/packages/SystemUI/res/drawable/pin_dot_shape_1_avd.xml @@ -91,32 +91,6 @@ - - - - - - - - - - - - - - @@ -151,8 +125,6 @@ + android:pivotY="1.795"> - - - - - - - - - - - - - - diff --git a/packages/SystemUI/res/drawable/pin_dot_shape_3_avd.xml b/packages/SystemUI/res/drawable/pin_dot_shape_3_avd.xml index e159a5c37199b..78e2249b7cc67 100644 --- a/packages/SystemUI/res/drawable/pin_dot_shape_3_avd.xml +++ b/packages/SystemUI/res/drawable/pin_dot_shape_3_avd.xml @@ -22,9 +22,7 @@ + android:translateY="15"> - - - - - - - - - - - - - - diff --git a/packages/SystemUI/res/drawable/pin_dot_shape_4_avd.xml b/packages/SystemUI/res/drawable/pin_dot_shape_4_avd.xml index 1a47d20ff1f1d..35c7210e1e3e6 100644 --- a/packages/SystemUI/res/drawable/pin_dot_shape_4_avd.xml +++ b/packages/SystemUI/res/drawable/pin_dot_shape_4_avd.xml @@ -69,32 +69,6 @@ - - - - - - - - - - - - - - @@ -129,8 +103,6 @@ + android:pivotY="-2.64"> - - - - - - - - - - - - - - diff --git a/packages/SystemUI/res/drawable/pin_dot_shape_6_avd.xml b/packages/SystemUI/res/drawable/pin_dot_shape_6_avd.xml index 29d7d2547377d..06e27df27f69e 100644 --- a/packages/SystemUI/res/drawable/pin_dot_shape_6_avd.xml +++ b/packages/SystemUI/res/drawable/pin_dot_shape_6_avd.xml @@ -23,9 +23,7 @@ android:name="_R_G_L_0_G" android:translateX="15" android:translateY="15.859" - android:pivotY="-0.859" - android:scaleX="0" - android:scaleY="0"> + android:pivotY="-0.859"> - - - - - - - - - - - - - -