Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
platform_frameworks_base-old
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Farzin Kazemzadeh
platform_frameworks_base-old
Commits
e5abc1e3
Commit
e5abc1e3
authored
1 year ago
by
Treehugger Robot
Committed by
Android (Google) Code Review
1 year ago
Browse files
Options
Downloads
Plain Diff
Merge "Remove computeValue.isSpecified" into main
parents
bf7da78c
74e8ed99
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/Element.kt
+0
-10
0 additions, 10 deletions
.../scene/src/com/android/compose/animation/scene/Element.kt
with
0 additions
and
10 deletions
packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/Element.kt
+
0
−
10
View file @
e5abc1e3
...
...
@@ -388,7 +388,6 @@ private fun elementAlpha(
transformation
=
{
it
.
alpha
},
idleValue
=
1f
,
currentValue
=
{
1f
},
isSpecified
=
{
true
},
::
lerp
,
)
.
fastCoerceIn
(
0f
,
1f
)
...
...
@@ -426,7 +425,6 @@ private fun ApproachMeasureScope.measure(
transformation
=
{
it
.
size
},
idleValue
=
lookaheadSize
,
currentValue
=
{
measurable
.
measure
(
constraints
).
also
{
maybePlaceable
=
it
}.
size
()
},
isSpecified
=
{
it
!=
Element
.
SizeUnspecified
},
::
lerp
,
)
...
...
@@ -452,7 +450,6 @@ private fun getDrawScale(
transformation
=
{
it
.
drawScale
},
idleValue
=
Scale
.
Default
,
currentValue
=
{
Scale
.
Default
},
isSpecified
=
{
true
},
::
lerp
,
)
}
...
...
@@ -493,7 +490,6 @@ private fun ApproachMeasureScope.place(
transformation
=
{
it
.
offset
},
idleValue
=
targetOffsetInScene
,
currentValue
=
{
currentOffset
},
isSpecified
=
{
it
!=
Offset
.
Unspecified
},
::
lerp
,
)
...
...
@@ -540,7 +536,6 @@ private inline fun <T> computeValue(
transformation
:
(
ElementTransformations
)
->
PropertyTransformation
<
T
>?,
idleValue
:
T
,
currentValue
:
()
->
T
,
isSpecified
:
(
T
)
->
Boolean
,
lerp
:
(
T
,
T
,
Float
)
->
T
,
):
T
{
val
transition
=
...
...
@@ -606,11 +601,6 @@ private inline fun <T> computeValue(
val
start
=
sceneValue
(
fromState
!!
)
val
end
=
sceneValue
(
toState
!!
)
// TODO(b/316901148): Remove checks to isSpecified() once the lookahead pass runs for all
// nodes before the intermediate layout pass.
if
(!
isSpecified
(
start
))
return
end
if
(!
isSpecified
(
end
))
return
start
// Make sure we don't read progress if values are the same and we don't need to interpolate,
// so we don't invalidate the phase where this is read.
return
if
(
start
==
end
)
start
else
lerp
(
start
,
end
,
transition
.
progress
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment