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

2020-04-03 17:48:05 +00:00
parent 594cbe8241 853a84b5e5
commit 17c3f421d4
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() {