Merge "Fixed that the importance ring might show inside of groups" into rvc-dev am: 17c3f421d4 am: 6af775fbbb

Change-Id: I0868188821988dc3bd77cd39c42b4a8242d39ecf
This commit is contained in:
Selim Cinek
2020-04-03 18:20:16 +00:00
committed by Automerger Merge Worker

View File

@@ -331,7 +331,8 @@ public class ConversationLayout extends FrameLayout
@RemotableViewMethod
public void setIsImportantConversation(boolean isImportantConversation) {
mImportantConversation = isImportantConversation;
mImportanceRingView.setVisibility(isImportantConversation ? VISIBLE : GONE);
mImportanceRingView.setVisibility(isImportantConversation
&& mIcon.getVisibility() != GONE ? VISIBLE : GONE);
}
public boolean isImportantConversation() {