Commit 1b679fb5 authored 1 year ago by Jiayin Liu Committed by Android (Google) Code Review 1 year ago

Merge changes from topic "revert-25515462-YLMDXMTZPP" into main

* changes:
  Revert "Migrate OCCLUDED<->LOCKSCREEN alpha/translation"
  Revert "Use shared flow for transition animations"

parents caa82d92 fa5c9e5e

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/KeyguardInteractorTest.kt 2 additions, 2 deletions

...emui/keyguard/domain/interactor/KeyguardInteractorTest.kt
packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/DreamingToLockscreenTransitionViewModelTest.kt 159 additions, 130 deletions

.../viewmodel/DreamingToLockscreenTransitionViewModelTest.kt
packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/GoneToDreamingTransitionViewModelTest.kt 50 additions, 38 deletions

...ard/ui/viewmodel/GoneToDreamingTransitionViewModelTest.kt
packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToDreamingTransitionViewModelTest.kt 6 additions, 1 deletion

.../viewmodel/LockscreenToDreamingTransitionViewModelTest.kt
packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToOccludedTransitionViewModelTest.kt 11 additions, 14 deletions

.../viewmodel/LockscreenToOccludedTransitionViewModelTest.kt
packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/OccludedToLockscreenTransitionViewModelTest.kt 123 additions, 96 deletions

.../viewmodel/OccludedToLockscreenTransitionViewModelTest.kt
packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/PrimaryBouncerToGoneTransitionViewModelTest.kt 62 additions, 48 deletions

.../viewmodel/PrimaryBouncerToGoneTransitionViewModelTest.kt
packages/SystemUI/src/com/android/keyguard/logging/KeyguardTransitionAnimationLogger.kt 0 additions, 74 deletions

...oid/keyguard/logging/KeyguardTransitionAnimationLogger.kt
packages/SystemUI/src/com/android/systemui/common/ui/domain/interactor/ConfigurationInteractor.kt 0 additions, 46 deletions

...ui/common/ui/domain/interactor/ConfigurationInteractor.kt
packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardRepository.kt 34 additions, 0 deletions

...d/systemui/keyguard/data/repository/KeyguardRepository.kt
packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardTransitionRepository.kt 5 additions, 2 deletions

.../keyguard/data/repository/KeyguardTransitionRepository.kt
packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardInteractor.kt 35 additions, 17 deletions

...systemui/keyguard/domain/interactor/KeyguardInteractor.kt
packages/SystemUI/src/com/android/systemui/keyguard/shared/model/KeyguardRootViewVisibilityState.kt 12 additions, 9 deletions

.../keyguard/shared/model/KeyguardRootViewVisibilityState.kt
packages/SystemUI/src/com/android/systemui/keyguard/ui/KeyguardTransitionAnimationFlow.kt 67 additions, 104 deletions

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

...oid/systemui/keyguard/ui/binder/KeyguardRootViewBinder.kt
packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/AlternateBouncerViewModel.kt 8 additions, 11 deletions

...stemui/keyguard/ui/viewmodel/AlternateBouncerViewModel.kt
packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/AodToGoneTransitionViewModel.kt 3 additions, 4 deletions

...mui/keyguard/ui/viewmodel/AodToGoneTransitionViewModel.kt
packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/AodToLockscreenTransitionViewModel.kt 6 additions, 7 deletions

...yguard/ui/viewmodel/AodToLockscreenTransitionViewModel.kt
packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/AodToOccludedTransitionViewModel.kt 3 additions, 4 deletions

...keyguard/ui/viewmodel/AodToOccludedTransitionViewModel.kt
packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/BouncerToGoneFlows.kt 4 additions, 5 deletions

...roid/systemui/keyguard/ui/viewmodel/BouncerToGoneFlows.kt

with 592 additions and 619 deletions

Please register or to comment