Merge "Fixed the historic messaging experience" into pi-dev am: e12f7fffcf (93c48c70) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/widget/MessagingLayout.java

+20 −1

Original line number	Diff line number	Diff line
		@@ -436,10 +436,29 @@ public class MessagingLayout extends FrameLayout {
		}

		private void updateHistoricMessageVisibility() {
		for (int i = 0; i < mHistoricMessages.size(); i++) {
		int numHistoric = mHistoricMessages.size();
		for (int i = 0; i < numHistoric; i++) {
		MessagingMessage existing = mHistoricMessages.get(i);
		existing.setVisibility(mShowHistoricMessages ? VISIBLE : GONE);
		}
		int numGroups = mGroups.size();
		for (int i = 0; i < numGroups; i++) {
		MessagingGroup group = mGroups.get(i);
		int visibleChildren = 0;
		List<MessagingMessage> messages = group.getMessages();
		int numGroupMessages = messages.size();
		for (int j = 0; j < numGroupMessages; j++) {
		MessagingMessage message = messages.get(j);
		if (message.getVisibility() != GONE) {
		visibleChildren++;
		}
		}
		if (visibleChildren > 0 && group.getVisibility() == GONE) {
		group.setVisibility(VISIBLE);
		} else if (visibleChildren == 0 && group.getVisibility() != GONE) {
		group.setVisibility(GONE);
		}
		}
		}

		@Override

+2 −0

Original line number	Diff line number	Diff line
		@@ -145,4 +145,6 @@ public interface MessagingMessage extends MessagingLinearLayout.MessagingChild {
		MessagingMessageState getState();

		void setVisibility(int visibility);

		int getVisibility();
		}