Merge "Fixed an issue where the notification could be blank" (5b1d1640) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentView.java

+9 −9

Original line number	Diff line number	Diff line
		@@ -492,12 +492,12 @@ public class NotificationContentView extends FrameLayout {
		if (child == null) {
		mExpandedChild = null;
		mExpandedWrapper = null;
		if (mVisibleType == VISIBLE_TYPE_EXPANDED) {
		mVisibleType = VISIBLE_TYPE_CONTRACTED;
		}
		if (mTransformationStartVisibleType == VISIBLE_TYPE_EXPANDED) {
		mTransformationStartVisibleType = UNDEFINED;
		}
		if (mVisibleType == VISIBLE_TYPE_EXPANDED) {
		selectLayout(false /* animate /, true / force */);
		}
		return;
		}
		addView(child);
		@@ -530,12 +530,12 @@ public class NotificationContentView extends FrameLayout {
		if (child == null) {
		mHeadsUpChild = null;
		mHeadsUpWrapper = null;
		if (mVisibleType == VISIBLE_TYPE_HEADSUP) {
		mVisibleType = VISIBLE_TYPE_CONTRACTED;
		}
		if (mTransformationStartVisibleType == VISIBLE_TYPE_HEADSUP) {
		mTransformationStartVisibleType = UNDEFINED;
		}
		if (mVisibleType == VISIBLE_TYPE_HEADSUP) {
		selectLayout(false /* animate /, true / force */);
		}
		return;
		}
		addView(child);
		@@ -557,12 +557,12 @@ public class NotificationContentView extends FrameLayout {
		if (child == null) {
		mAmbientChild = null;
		mAmbientWrapper = null;
		if (mVisibleType == VISIBLE_TYPE_AMBIENT) {
		mVisibleType = VISIBLE_TYPE_CONTRACTED;
		}
		if (mTransformationStartVisibleType == VISIBLE_TYPE_AMBIENT) {
		mTransformationStartVisibleType = UNDEFINED;
		}
		if (mVisibleType == VISIBLE_TYPE_AMBIENT) {
		selectLayout(false /* animate /, true / force */);
		}
		return;
		}
		addView(child);