Commit db4e5eef authored 1 year ago by Lucas Silva Committed by Android (Google) Code Review 1 year ago

Merge changes I06425379,Ifa2afa17 into main

* changes:
  Polish hub <-> lockscreen motion
  Implement dream overlay motion when entering hub

parents c7585718 4a00ae2e

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

packages/SystemUI/compose/facade/enabled/src/com/android/systemui/compose/ComposeFacade.kt 15 additions, 6 deletions

...enabled/src/com/android/systemui/compose/ComposeFacade.kt
packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalContainer.kt 22 additions, 4 deletions

...android/systemui/communal/ui/compose/CommunalContainer.kt
packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalHub.kt 0 additions, 1 deletion

...c/com/android/systemui/communal/ui/compose/CommunalHub.kt
packages/SystemUI/multivalentTests/src/com/android/systemui/dreams/DreamOverlayAnimationsControllerTest.kt 2 additions, 2 deletions

...d/systemui/dreams/DreamOverlayAnimationsControllerTest.kt
packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/DreamingToGlanceableHubTransitionViewModelTest.kt 97 additions, 0 deletions

...ewmodel/DreamingToGlanceableHubTransitionViewModelTest.kt
packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/GlanceableHubToLockscreenTransitionViewModelTest.kt 114 additions, 0 deletions

...model/GlanceableHubToLockscreenTransitionViewModelTest.kt
packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToGlanceableHubTransitionViewModelTest.kt 115 additions, 0 deletions

...model/LockscreenToGlanceableHubTransitionViewModelTest.kt
packages/SystemUI/res/values/dimens.xml 7 additions, 0 deletions

packages/SystemUI/res/values/dimens.xml
packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayAnimationsController.kt 37 additions, 59 deletions

...droid/systemui/dreams/DreamOverlayAnimationsController.kt
packages/SystemUI/src/com/android/systemui/dreams/ui/viewmodel/DreamOverlayViewModel.kt 61 additions, 0 deletions

...oid/systemui/dreams/ui/viewmodel/DreamOverlayViewModel.kt
packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromDreamingTransitionInteractor.kt 13 additions, 0 deletions

...ard/domain/interactor/FromDreamingTransitionInteractor.kt
packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromGlanceableHubTransitionInteractor.kt 10 additions, 6 deletions

...omain/interactor/FromGlanceableHubTransitionInteractor.kt
packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromLockscreenTransitionInteractor.kt 6 additions, 4 deletions

...d/domain/interactor/FromLockscreenTransitionInteractor.kt
packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/GlanceableHubTransitions.kt 9 additions, 11 deletions

...ui/keyguard/domain/interactor/GlanceableHubTransitions.kt
packages/SystemUI/src/com/android/systemui/keyguard/ui/KeyguardTransitionAnimationFlow.kt 15 additions, 8 deletions

...d/systemui/keyguard/ui/KeyguardTransitionAnimationFlow.kt
packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardRootViewBinder.kt 28 additions, 4 deletions

...oid/systemui/keyguard/ui/binder/KeyguardRootViewBinder.kt
packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/DreamingToGlanceableHubTransitionViewModel.kt 59 additions, 0 deletions

...i/viewmodel/DreamingToGlanceableHubTransitionViewModel.kt
packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/GlanceableHubToLockscreenTransitionViewModel.kt 39 additions, 19 deletions

...viewmodel/GlanceableHubToLockscreenTransitionViewModel.kt
packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardRootViewModel.kt 7 additions, 2 deletions

...d/systemui/keyguard/ui/viewmodel/KeyguardRootViewModel.kt
packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToGlanceableHubTransitionViewModel.kt 39 additions, 17 deletions

...viewmodel/LockscreenToGlanceableHubTransitionViewModel.kt

with 695 additions and 143 deletions

Please register or to comment