From f519e3ffe5e14d784f840d5bb236ee29fc35422a Mon Sep 17 00:00:00 2001 From: Emily Chuang Date: Tue, 6 Nov 2018 19:56:42 +0800 Subject: [PATCH] Make ContextualCardLoader do entire loading upon fragment's onStart() For dismissal mechanism, we will have to get information about those dismissed cards that are stored in Card DB with flag "dismiss" to filter them out. Currently we only do the entire loading in fragment's onCreate(), so only when the fragment is recreated users can get the new data. Now we are changing it to onStart() and make the loader restart so we are able to show the latest cards. Change-Id: I4c0be297232f026b46feb8084084816e1acc8f11 Fixes: 119090460 Bug: 113783548 Test: visual --- .../homepage/contextualcards/ContextualCardManager.java | 2 +- .../homepage/contextualcards/ContextualCardsFragment.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/homepage/contextualcards/ContextualCardManager.java b/src/com/android/settings/homepage/contextualcards/ContextualCardManager.java index 51bef8726c9..9bd08c8a3fe 100644 --- a/src/com/android/settings/homepage/contextualcards/ContextualCardManager.java +++ b/src/com/android/settings/homepage/contextualcards/ContextualCardManager.java @@ -84,7 +84,7 @@ public class ContextualCardManager implements ContextualCardLoader.CardContentLo final CardContentLoaderCallbacks cardContentLoaderCallbacks = new CardContentLoaderCallbacks(mContext); cardContentLoaderCallbacks.setListener(this); - LoaderManager.getInstance(fragment).initLoader(CARD_CONTENT_LOADER_ID, null /* bundle */, + LoaderManager.getInstance(fragment).restartLoader(CARD_CONTENT_LOADER_ID, null /* bundle */, cardContentLoaderCallbacks); } diff --git a/src/com/android/settings/homepage/contextualcards/ContextualCardsFragment.java b/src/com/android/settings/homepage/contextualcards/ContextualCardsFragment.java index d82fdfeaa5e..29eea4b7fa2 100644 --- a/src/com/android/settings/homepage/contextualcards/ContextualCardsFragment.java +++ b/src/com/android/settings/homepage/contextualcards/ContextualCardsFragment.java @@ -43,6 +43,11 @@ public class ContextualCardsFragment extends InstrumentedFragment { public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); mContextualCardManager = new ContextualCardManager(getContext(), getSettingsLifecycle()); + } + + @Override + public void onStart() { + super.onStart(); mContextualCardManager.loadContextualCards(this); }