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

Skip to content
Commit 63601c4b authored by Jordan Demeulenaere's avatar Jordan Demeulenaere Committed by Android (Google) Code Review
Browse files

Merge changes from topics "stl-content-picker", "stl-content-state",... 

Merge changes from topics "stl-content-picker", "stl-content-state", "stl-static-picker", "stl-transition-state" into main

* changes:
  Allow to specify transitions between contents
  Introduce StaticElementContentPicker (1/2)
  Rename ElementScenePicker to ElementContentPicker (1/2)
  Use ContentState.Transition in Element.kt
  Extract ContentState out of TransitionState (1/2)
  Move TransitionState into its own file (1/2)
parents ee0fd4ee 41206691
Expand all Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment