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

Commit e66a3c35 authored by Jamie Garside's avatar Jamie Garside Committed by Automerger Merge Worker
Browse files

Merge "Fix bug where the clock may not exist when using custom animation."... 

Merge "Fix bug where the clock may not exist when using custom animation." into tm-qpr-dev am: 19e7d37b am: 45f2279c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20480245



Change-Id: I0e4ad44c37de9e2ddc1d86c2fd4ec90b48e7925a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2e333890 45f2279c

packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java

+20 −12
Original line number Diff line number Diff line
@@ -1567,6 +1567,13 @@ 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);



                    // 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);



                        transition.excludeTarget(clockView, /* exclude= */ true);
@@ -1584,6 +1591,7 @@ public final class NotificationPanelViewController implements Dumpable { 
                        set.addTransition(adapter);



                        TransitionManager.beginDelayedTransition(mNotificationContainerParent, set);

                    }

                } else {

                    TransitionManager.beginDelayedTransition(

                            mNotificationContainerParent, transition);