Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d6fe13fb authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "MM Vertical reveal: approach on Measurement only" into main

parents 9a501dfd 3bf2301b

mechanics/compose/src/com/android/mechanics/compose/modifier/VerticalFadeContentRevealModifier.kt

+0 −5
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import androidx.compose.ui.layout.LayoutCoordinates 
import androidx.compose.ui.layout.Measurable

import androidx.compose.ui.layout.MeasureResult

import androidx.compose.ui.layout.MeasureScope

import androidx.compose.ui.layout.Placeable

import androidx.compose.ui.layout.boundsInParent

import androidx.compose.ui.node.ModifierNodeElement

import androidx.compose.ui.platform.InspectorInfo
@@ -174,10 +173,6 @@ internal class FadeContentRevealNode( 


    override fun isMeasurementApproachInProgress(lookaheadSize: IntSize) = isAnimating()



    override fun Placeable.PlacementScope.isPlacementApproachInProgress(

        lookaheadCoordinates: LayoutCoordinates

    ) = isAnimating()



    private var targetBounds = Rect.Zero



    private var lastCoordinates: LayoutCoordinates? = null

mechanics/compose/src/com/android/mechanics/compose/modifier/VerticalTactileSurfaceRevealModifier.kt

+0 −5
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import androidx.compose.ui.layout.LayoutCoordinates 
import androidx.compose.ui.layout.Measurable

import androidx.compose.ui.layout.MeasureResult

import androidx.compose.ui.layout.MeasureScope

import androidx.compose.ui.layout.Placeable

import androidx.compose.ui.layout.boundsInParent

import androidx.compose.ui.node.ModifierNodeElement

import androidx.compose.ui.platform.InspectorInfo
@@ -189,10 +188,6 @@ private class VerticalTactileSurfaceRevealNode( 


    override fun isMeasurementApproachInProgress(lookaheadSize: IntSize) = isAnimating()



    override fun Placeable.PlacementScope.isPlacementApproachInProgress(

        lookaheadCoordinates: LayoutCoordinates

    ) = isAnimating()



    private var targetBounds = Rect.Zero



    private var lastCoordinates: LayoutCoordinates? = null