Merge "Revert "Revert "Check that ViewTreeObserver is alive before unregistering listener.""" (e2cd6137) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java

+6 −2

Original line number	Diff line number	Diff line
		@@ -436,7 +436,9 @@ public class NotificationShelf extends ActivatableNotificationView implements
		public boolean onPreDraw() {
		boolean animatingY = ViewState.isAnimatingY(icon);
		if (!animatingY) {
		if (observer.isAlive()) {
		observer.removeOnPreDrawListener(this);
		}
		icon.setTag(TAG_CONTINUOUS_CLIPPING, null);
		return true;
		}
		@@ -453,7 +455,9 @@ public class NotificationShelf extends ActivatableNotificationView implements
		@Override
		public void onViewDetachedFromWindow(View v) {
		if (v == icon) {
		if (observer.isAlive()) {
		observer.removeOnPreDrawListener(predrawListener);
		}
		icon.setTag(TAG_CONTINUOUS_CLIPPING, null);
		}
		}