Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixed the historic messaging experience" into pi-dev

Browse Source 
am: e12f7fffcf

Change-Id: I4eee4a2a5d1b3941d15a7b9d0a14c6441415d10e
This commit is contained in:
Selim Cinek
2018-05-07 14:04:27 -07:00
committed by android-build-merger
parent d3d8a3c04a e12f7fffcf
commit 64a4170c37
2 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
core/java/com/android/internal/widget/MessagingLayout.java
View File

@@ -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
core/java/com/android/internal/widget/MessagingMessage.java
View File

@@ -145,4 +145,6 @@ public interface MessagingMessage extends MessagingLinearLayout.MessagingChild {
MessagingMessageState getState();
void setVisibility(int visibility);
int getVisibility();
}