Settings: Make sure to rebuild on app entries loaded.

  Previously, notifydatasetchanged would only be called in oncreate,
  and any further callbacks from the application state session would
  be ignored. Now, make sure to handle the various scenarios and rebuild
  as necessary, notifying the ui as needed.

Change-Id: I61572ff082629046d1fdf5fedb1e8ec37343f588
TICKET: FEIJ-334

1 files changed, 3 insertions, 4 deletions

diff --git a/src/com/android/settings/applications/ExpandedDesktopPreferenceFragment.java b/src/com/android/settings/applications/ExpandedDesktopPreferenceFragment.java
index af8bf10..4f4f234 100644
--- a/src/com/android/settings/applications/ExpandedDesktopPreferenceFragment.java
+++ b/src/com/android/settings/applications/ExpandedDesktopPreferenceFragment.java
@@ -106,8 +106,6 @@ public class ExpandedDesktopPreferenceFragment extends SettingsPreferenceFragmen
         }
         mAllPackagesAdapter = new AllPackagesAdapter(getActivity());
 
-        mAllPackagesAdapter.notifyDataSetChanged();
-
         setHasOptionsMenu(true);
     }
 
@@ -260,7 +258,7 @@ public class ExpandedDesktopPreferenceFragment extends SettingsPreferenceFragmen
 
     @Override
     public void onRebuildComplete(ArrayList<ApplicationsState.AppEntry> entries) {
-        handleAppEntries(entries);
+        rebuild();
     }
 
     @Override
@@ -282,7 +280,7 @@ public class ExpandedDesktopPreferenceFragment extends SettingsPreferenceFragmen
 
     @Override
     public void onLoadEntriesCompleted() {
-
+        rebuild();
     }
 
     private void handleAppEntries(List<ApplicationsState.AppEntry> entries) {
@@ -335,6 +333,7 @@ public class ExpandedDesktopPreferenceFragment extends SettingsPreferenceFragmen
                 mActivityFilter, ApplicationsState.ALPHA_COMPARATOR);
         if (newEntries != null) {
             handleAppEntries(newEntries);
+            mAllPackagesAdapter.notifyDataSetChanged();
         }
     }