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

Change-Id: Ib9ae5480fc966b80ef27b7131b7b0342c089ac56
2020-04-03 18:09:35 +00:00
parent ea5a8302b3 17c3f421d4
commit 48b90c78e8
1 changed files with 2 additions and 1 deletions
--- a/core/java/com/android/internal/widget/ConversationLayout.java
+++ b/core/java/com/android/internal/widget/ConversationLayout.java
@@ -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() {