From 8c4ca41d2595925d108dad82959faddb676a392d Mon Sep 17 00:00:00 2001
From: Jason Monk <jmonk@google.com>
Date: Mon, 30 Nov 2015 15:37:31 -0500
Subject: [PATCH] Make sure the dashboard is up to date

Bug: 25794089
Change-Id: I65eaa8e14b3c998ec122eaa9fc4dbbe3749c568c
---
 src/com/android/settings/dashboard/DashboardAdapter.java | 4 ++++
 src/com/android/settings/dashboard/DashboardSummary.java | 7 +++++++
 src/com/android/settings/dashboard/SummaryLoader.java    | 9 +++++++--
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/dashboard/DashboardAdapter.java b/src/com/android/settings/dashboard/DashboardAdapter.java
index e2024f7a881..6228bbc5875 100644
--- a/src/com/android/settings/dashboard/DashboardAdapter.java
+++ b/src/com/android/settings/dashboard/DashboardAdapter.java
@@ -72,6 +72,10 @@ public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.Dash
         setHasStableIds(true);
     }
 
+    public boolean isShowingAll() {
+        return mIsShowingAll;
+    }
+
     public void notifyChanged(DashboardTile tile) {
         for (int i = 0; i < mItems.size(); i++) {
             if (mItems.get(i) == tile) {
diff --git a/src/com/android/settings/dashboard/DashboardSummary.java b/src/com/android/settings/dashboard/DashboardSummary.java
index 84464756a45..54a5ff43914 100644
--- a/src/com/android/settings/dashboard/DashboardSummary.java
+++ b/src/com/android/settings/dashboard/DashboardSummary.java
@@ -133,6 +133,13 @@ public class DashboardSummary extends InstrumentedFragment {
         }
 
         long start = System.currentTimeMillis();
+        // TODO: Cache summaries from old categories somehow.
+        List<DashboardCategory> categories =
+                ((SettingsActivity) getActivity()).getDashboardCategories(true);
+        boolean showingAll = mAdapter != null && mAdapter.isShowingAll();
+        mAdapter = new DashboardAdapter(getContext(), categories);
+        mSummaryLoader.setAdapter(mAdapter);
+        mAdapter.setShowingAll(showingAll);
         mDashboard.setAdapter(mAdapter);
 
         long delta = System.currentTimeMillis() - start;
diff --git a/src/com/android/settings/dashboard/SummaryLoader.java b/src/com/android/settings/dashboard/SummaryLoader.java
index 4bbee8ccba2..a5481ac64d2 100644
--- a/src/com/android/settings/dashboard/SummaryLoader.java
+++ b/src/com/android/settings/dashboard/SummaryLoader.java
@@ -33,12 +33,13 @@ public class SummaryLoader {
     private static final boolean DEBUG = DashboardSummary.DEBUG;
     private static final String TAG = "SummaryLoader";
 
+    public static final String SUMMARY_PROVIDER_FACTORY = "SUMMARY_PROVIDER_FACTORY";
+
     private final Activity mActivity;
-    private final DashboardAdapter mAdapter;
     private final ArrayMap<SummaryProvider, DashboardTile> mSummaryMap = new ArrayMap<>();
     private final List<DashboardTile> mTiles = new ArrayList<>();
 
-    public static final String SUMMARY_PROVIDER_FACTORY = "SUMMARY_PROVIDER_FACTORY";
+    private DashboardAdapter mAdapter;
 
     public SummaryLoader(Activity activity, DashboardAdapter adapter,
                   List<DashboardCategory> categories) {
@@ -56,6 +57,10 @@ public class SummaryLoader {
         }
     }
 
+    public void setAdapter(DashboardAdapter adapter) {
+        mAdapter = adapter;
+    }
+
     public void setSummary(SummaryProvider provider, CharSequence summary) {
         DashboardTile tile = mSummaryMap.get(provider);
         tile.summary = summary;