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

Merge "Fix bug where the clock may not exist when using custom animation." into tm-qpr-dev

Browse Source
This commit is contained in:
Jamie Garside
2022-11-16 14:59:01 +00:00
committed by Android (Google) Code Review
parent 59221c270b dd2b7e67ef
commit 19e7d37b95
1 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1567,23 +1567,31 @@ public final class NotificationPanelViewController implements Dumpable {
// Find the clock, so we can exclude it from this transition.
FrameLayout clockContainerView =
mView.findViewById(R.id.lockscreen_clock_view_large);
View clockView = clockContainerView.getChildAt(0);
transition.excludeTarget(clockView, /* exclude= */ true);
// The clock container can sometimes be null. If it is, just fall back to the
// old animation rather than setting up the custom animations.
if (clockContainerView == null || clockContainerView.getChildCount() == 0) {
TransitionManager.beginDelayedTransition(
mNotificationContainerParent, transition);
} else {
View clockView = clockContainerView.getChildAt(0);
TransitionSet set = new TransitionSet();
set.addTransition(transition);
transition.excludeTarget(clockView, /* exclude= */ true);
SplitShadeTransitionAdapter adapter =
new SplitShadeTransitionAdapter(mKeyguardStatusViewController);
TransitionSet set = new TransitionSet();
set.addTransition(transition);
// Use linear here, so the actual clock can pick its own interpolator.
adapter.setInterpolator(Interpolators.LINEAR);
adapter.setDuration(StackStateAnimator.ANIMATION_DURATION_STANDARD);
adapter.addTarget(clockView);
set.addTransition(adapter);
SplitShadeTransitionAdapter adapter =
new SplitShadeTransitionAdapter(mKeyguardStatusViewController);
TransitionManager.beginDelayedTransition(mNotificationContainerParent, set);
// Use linear here, so the actual clock can pick its own interpolator.
adapter.setInterpolator(Interpolators.LINEAR);
adapter.setDuration(StackStateAnimator.ANIMATION_DURATION_STANDARD);
adapter.addTarget(clockView);
set.addTransition(adapter);
TransitionManager.beginDelayedTransition(mNotificationContainerParent, set);
}
} else {
TransitionManager.beginDelayedTransition(
mNotificationContainerParent, transition);