Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Animate status bar alpha during dream<->lockscreen transitions." into udc-qpr-dev

Browse Source
This commit is contained in:
William Leshner
2023-08-10 21:36:48 +00:00
committed by Android (Google) Code Review
parent 6842f3d64d 3b00da2769
commit 2200a33686
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java
View File

@@ -1117,7 +1117,8 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump
collectFlow(mView, mKeyguardTransitionInteractor.getDreamingToLockscreenTransition(),
mDreamingToLockscreenTransition, mMainDispatcher);
collectFlow(mView, mDreamingToLockscreenTransitionViewModel.getLockscreenAlpha(),
setTransitionAlpha(mNotificationStackScrollLayoutController), mMainDispatcher);
setDreamLockscreenTransitionAlpha(mNotificationStackScrollLayoutController),
mMainDispatcher);
collectFlow(mView, mDreamingToLockscreenTransitionViewModel.lockscreenTranslationY(
mDreamingToLockscreenTransitionTranslationY),
setTransitionY(mNotificationStackScrollLayoutController), mMainDispatcher);
@@ -1153,7 +1154,8 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump
collectFlow(mView, mKeyguardTransitionInteractor.getLockscreenToDreamingTransition(),
mLockscreenToDreamingTransition, mMainDispatcher);
collectFlow(mView, mLockscreenToDreamingTransitionViewModel.getLockscreenAlpha(),
setTransitionAlpha(mNotificationStackScrollLayoutController), mMainDispatcher);
setDreamLockscreenTransitionAlpha(mNotificationStackScrollLayoutController),
mMainDispatcher);
collectFlow(mView, mLockscreenToDreamingTransitionViewModel.lockscreenTranslationY(
mLockscreenToDreamingTransitionTranslationY),
setTransitionY(mNotificationStackScrollLayoutController), mMainDispatcher);
@@ -4742,6 +4744,16 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump
mCurrentPanelState = state;
}
private Consumer<Float> setDreamLockscreenTransitionAlpha(
NotificationStackScrollLayoutController stackScroller) {
return (Float alpha) -> {
// Also animate the status bar's alpha during transitions between the lockscreen and
// dreams.
mKeyguardStatusBarViewController.setAlpha(alpha);
setTransitionAlpha(stackScroller).accept(alpha);
};
}
private Consumer<Float> setTransitionAlpha(
NotificationStackScrollLayoutController stackScroller) {
return (Float alpha) -> {