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

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

+6 −2

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