summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jordan Demeulenaere <jdemeulenaere@google.com> 2023-11-15 13:22:16 +0100
committer Jordan Demeulenaere <jdemeulenaere@google.com> 2023-11-15 14:21:25 +0100
commitd9c1b4504b335d737565532d1d87eb88e4cb58b3 (patch)
tree5d28589a12c51589dcd1cc923d1d2de3ecee56df
parentfe810dc2cf6a463d53fc96476bc4458122f06d11 (diff)
Move PunchHole.kt to the animation/scene/ directory
This CL moves PunchHole.kt out of the transformation/ directory. This is a pure move to improve the diff of the parent CL http://ag/25382493. Test: PunchHoleTest Bug: 291071158 Flag: NA Change-Id: Ia70d7d8df72a14685ab4c46b4615c91edaf54641
-rw-r--r--packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/PunchHole.kt (renamed from packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/transformation/PunchHole.kt)8
-rw-r--r--packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/TransitionDslImpl.kt1
2 files changed, 2 insertions, 7 deletions
diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/transformation/PunchHole.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/PunchHole.kt
index 984086b7792a..a8d364060e88 100644
--- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/transformation/PunchHole.kt
+++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/PunchHole.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.compose.animation.scene.transformation
+package com.android.compose.animation.scene
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.drawWithContent
@@ -34,11 +34,7 @@ import androidx.compose.ui.graphics.drawscope.translate
import androidx.compose.ui.graphics.withSaveLayer
import androidx.compose.ui.unit.LayoutDirection
import androidx.compose.ui.unit.toSize
-import com.android.compose.animation.scene.Element
-import com.android.compose.animation.scene.ElementKey
-import com.android.compose.animation.scene.ElementMatcher
-import com.android.compose.animation.scene.Scene
-import com.android.compose.animation.scene.SceneTransitionLayoutImpl
+import com.android.compose.animation.scene.transformation.ModifierTransformation
/** Punch a hole in an element using the bounds of another element and a given [shape]. */
internal class PunchHole(
diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/TransitionDslImpl.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/TransitionDslImpl.kt
index d4909892f492..bcb20913e554 100644
--- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/TransitionDslImpl.kt
+++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/TransitionDslImpl.kt
@@ -30,7 +30,6 @@ import com.android.compose.animation.scene.transformation.DrawScale
import com.android.compose.animation.scene.transformation.EdgeTranslate
import com.android.compose.animation.scene.transformation.Fade
import com.android.compose.animation.scene.transformation.PropertyTransformation
-import com.android.compose.animation.scene.transformation.PunchHole
import com.android.compose.animation.scene.transformation.RangedPropertyTransformation
import com.android.compose.animation.scene.transformation.ScaleSize
import com.android.compose.animation.scene.transformation.SharedElementTransformation