Merge "[Notif] Safeguard animation start" into pi-dev (97d17a77) · Commits · e / os / android_frameworks_base

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

+48 −39

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@ import android.graphics.drawable.Drawable;
		import android.os.Handler;
		import android.support.annotation.Nullable;
		import android.util.AttributeSet;
		import android.util.Log;
		import android.view.View;
		import android.view.ViewAnimationUtils;
		import android.view.accessibility.AccessibilityEvent;
		@@ -247,6 +248,7 @@ public class NotificationGuts extends FrameLayout {
		/** Animates in the guts view via either a fade or a circular reveal. */
		private void animateOpen(
		boolean shouldDoCircularReveal, int x, int y, @Nullable Runnable onAnimationEnd) {
		if (isAttachedToWindow()) {
		if (shouldDoCircularReveal) {
		double horz = Math.max(getWidth() - x, x);
		double vert = Math.max(getHeight() - y, y);
		@@ -267,12 +269,16 @@ public class NotificationGuts extends FrameLayout {
		.setListener(new AnimateOpenListener(onAnimationEnd))
		.start();
		}
		} else {
		Log.w(TAG, "Failed to animate guts open");
		}
		}


		/** Animates out the guts view via either a fade or a circular reveal. */
		@VisibleForTesting
		void animateClose(int x, int y, boolean shouldDoCircularReveal) {
		if (isAttachedToWindow()) {
		if (shouldDoCircularReveal) {
		// Circular reveal originating at (x, y)
		if (x == -1 \|\| y == -1) {
		@@ -297,6 +303,9 @@ public class NotificationGuts extends FrameLayout {
		.setListener(new AnimateCloseListener(this /* view */))
		.start();
		}
		} else {
		Log.w(TAG, "Failed to animate guts close");
		}
		}

		public void setActualHeight(int actualHeight) {