Merge "Fix bug where the clock may not exist when using custom animation." into tm-qpr-dev (19e7d37b) · Commits · e / os / android_frameworks_base

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