Improve entrance animations on convo page

By moving loading in each controller to the same thread.
There will still be shifting as the conversation prefs are added, but it
won't be the over thte top shift up and shift down motion that existed
prior to this cl.

Test: manual
Fixes: 188734400
Change-Id: I202981b603b8f9308b2b352a0939182910869cd6

res/xml/conversation_list_settings.xml

@@ -29,7 +29,7 @@
     <PreferenceCategory
         android:key="important_conversations"
         android:title="@string/important_conversations"
-        android:visibility="gone"
+        settings:isPreferenceVisible="false"
         settings:allowDividerAbove="false"
         settings:allowDividerBelow="true" >
         <Preference
@@ -48,6 +48,7 @@
     <PreferenceCategory
         android:title="@string/other_conversations"
         android:key="other_conversations"
+        settings:isPreferenceVisible="false"
         settings:allowDividerAbove="true"
         settings:allowDividerBelow="false" />
 
@@ -55,6 +56,7 @@
     <PreferenceCategory
         android:title="@string/recent_conversations"
         android:key="recent_conversations"
+        settings:isPreferenceVisible="false"
         settings:allowDividerAbove="true"
         settings:allowDividerBelow="false" />
 

src/com/android/settings/notification/app/AllConversationsPreferenceController.java

@@ -68,21 +68,10 @@ public class AllConversationsPreferenceController extends ConversationListPrefer
     public void updateState(Preference preference) {
         PreferenceCategory pref = (PreferenceCategory) preference;
         // Load conversations
-        new AsyncTask<Void, Void, Void>() {
-            @Override
-            protected Void doInBackground(Void... unused) {
-                mConversations = mBackend.getConversations(false).getList();
-                Collections.sort(mConversations, mConversationComparator);
-                return null;
-            }
 
-            @Override
+        mConversations = mBackend.getConversations(false).getList();
-            protected void onPostExecute(Void unused) {
+        Collections.sort(mConversations, mConversationComparator);
-                if (mContext == null) {
+
-                    return;
+        populateList(mConversations, pref);
-                }
-                populateList(mConversations, pref);
-            }
-        }.execute();
     }
 }

src/com/android/settings/notification/app/ConversationListPreferenceController.java

@@ -63,7 +63,7 @@ public abstract class ConversationListPreferenceController extends AbstractPrefe
 
     protected void populateList(List<ConversationChannelWrapper> conversations,
             PreferenceGroup containerGroup) {
-        // TODO: if preference has children, compare with newly loaded list
+        containerGroup.setVisible(false);
         containerGroup.removeAll();
         if (conversations != null) {
             populateConversations(conversations, containerGroup);
@@ -72,11 +72,11 @@ public abstract class ConversationListPreferenceController extends AbstractPrefe
         if (containerGroup.getPreferenceCount() == 0) {
             containerGroup.setVisible(false);
         } else {
-            containerGroup.setVisible(true);
             Preference summaryPref = getSummaryPreference();
             if (summaryPref != null) {
                 containerGroup.addPreference(summaryPref);
             }
+            containerGroup.setVisible(true);
         }
     }
 

src/com/android/settings/notification/app/PriorityConversationsPreferenceController.java

@@ -67,22 +67,9 @@ public class PriorityConversationsPreferenceController extends
     public void updateState(Preference preference) {
         PreferenceCategory pref = (PreferenceCategory) preference;
         // Load conversations
-        new AsyncTask<Void, Void, Void>() {
+        mConversations = mBackend.getConversations(true).getList();
-            @Override
+        Collections.sort(mConversations, mConversationComparator);
-            protected Void doInBackground(Void... unused) {
-                mConversations = mBackend.getConversations(true).getList();
-                Collections.sort(mConversations, mConversationComparator);
-                return null;
-            }
-
-            @Override
-            protected void onPostExecute(Void unused) {
-                if (mContext == null) {
-                    return;
-                }
-                populateList(mConversations, pref);
-            }
-        }.execute();
 
+        populateList(mConversations, pref);
     }
 }

src/com/android/settings/notification/app/RecentConversationsPreferenceController.java

@@ -104,26 +104,14 @@ public class RecentConversationsPreferenceController extends AbstractPreferenceC
     public void updateState(Preference preference) {
         PreferenceCategory pref = (PreferenceCategory) preference;
         // Load conversations
-        new AsyncTask<Void, Void, Void>() {
+        try {
-            @Override
+            mConversations = mPs.getRecentConversations().getList();
-            protected Void doInBackground(Void... unused) {
+        } catch (RemoteException e) {
-                try {
+            Slog.w(TAG, "Could get recents", e);
-                    mConversations = mPs.getRecentConversations().getList();
+        }
-                } catch (RemoteException e) {
+        Collections.sort(mConversations, mConversationComparator);
-                    Slog.w(TAG, "Could get recents", e);
-                }
-                Collections.sort(mConversations, mConversationComparator);
-                return null;
-            }
 
-            @Override
+        populateList(mConversations, pref);
-            protected void onPostExecute(Void unused) {
-                if (mContext == null) {
-                    return;
-                }
-                populateList(mConversations, pref);
-            }
-        }.execute();
 
     }