From f0c324563901ac8b365c077f8a441eae7edf2786 Mon Sep 17 00:00:00 2001
From: Julia Reynolds <juliacr@google.com>
Date: Fri, 15 May 2020 13:58:51 -0400
Subject: [PATCH] Fix jank on conversation screen

Onboarding should only appear if needed

Test: manual
Fixes: 156756305
Change-Id: I663677772806db9c80979cdac103c9fa657ee7e2
---
 res/layout/conversation_onboarding.xml                    | 2 ++
 .../app/NoConversationsPreferenceController.java          | 8 ++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/res/layout/conversation_onboarding.xml b/res/layout/conversation_onboarding.xml
index bc180947831..5de21666285 100644
--- a/res/layout/conversation_onboarding.xml
+++ b/res/layout/conversation_onboarding.xml
@@ -15,10 +15,12 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:id="@+id/onboarding"
               android:layout_width="match_parent"
               android:layout_height="match_parent"
               android:layout_gravity="center"
               android:gravity="center"
+              android:visibility="gone"
               android:orientation="vertical">
 
     <ImageView
diff --git a/src/com/android/settings/notification/app/NoConversationsPreferenceController.java b/src/com/android/settings/notification/app/NoConversationsPreferenceController.java
index c5f0cb2c3dd..7b626f6a631 100644
--- a/src/com/android/settings/notification/app/NoConversationsPreferenceController.java
+++ b/src/com/android/settings/notification/app/NoConversationsPreferenceController.java
@@ -19,13 +19,14 @@ package com.android.settings.notification.app;
 import android.content.Context;
 import android.os.AsyncTask;
 import android.service.notification.ConversationChannelWrapper;
+import android.view.View;
 
 import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
 
+import com.android.settings.R;
 import com.android.settings.notification.NotificationBackend;
+import com.android.settingslib.widget.LayoutPreference;
 
-import java.util.Collections;
 import java.util.List;
 
 public class NoConversationsPreferenceController extends ConversationListPreferenceController {
@@ -56,6 +57,7 @@ public class NoConversationsPreferenceController extends ConversationListPrefere
 
     @Override
     public void updateState(Preference preference) {
+        LayoutPreference pref = (LayoutPreference) preference;
         // Load conversations
         new AsyncTask<Void, Void, Void>() {
             @Override
@@ -69,6 +71,8 @@ public class NoConversationsPreferenceController extends ConversationListPrefere
                 if (mContext == null) {
                     return;
                 }
+                pref.findViewById(R.id.onboarding).setVisibility(mConversations.size() == 0
+                        ? View.VISIBLE : View.GONE);
                 preference.setVisible(mConversations.size() == 0);
             }
         }.execute();