PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not log Contextual card display when card is dismissed

Browse Source 
If the db change comes from dismiss card uri. We don't
need to log card display again.

Fixes: 121196921
Test: Robolectric
Change-Id: I4e222187fafa8325e803fa6ee17ebb0b51fb8cb2
This commit is contained in:
Raff Tsai
2019-02-17 01:22:39 +08:00
parent d5a04e1912
commit 3881e2986c
6 changed files with 53 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java
View File

@@ -59,13 +59,16 @@ public class ContextualCardLoader extends AsyncLoaderCompat<List<ContextualCard>
private final ContentObserver mObserver = new ContentObserver(
new Handler(Looper.getMainLooper())) {
@Override
public void onChange(boolean selfChange) {
public void onChange(boolean selfChange, Uri uri) {
if (isStarted()) {
mNotifyUri = uri;
forceLoad();
}
}
};
@VisibleForTesting
Uri mNotifyUri;
private Context mContext;
ContextualCardLoader(Context context) {
@@ -77,7 +80,10 @@ public class ContextualCardLoader extends AsyncLoaderCompat<List<ContextualCard>
@Override
protected void onStartLoading() {
super.onStartLoading();
mContext.getContentResolver().registerContentObserver(CardContentProvider.URI,
mNotifyUri = null;
mContext.getContentResolver().registerContentObserver(CardContentProvider.REFRESH_CARD_URI,
false /*notifyForDescendants*/, mObserver);
mContext.getContentResolver().registerContentObserver(CardContentProvider.DELETE_CARD_URI,
false /*notifyForDescendants*/, mObserver);
}
@@ -156,10 +162,12 @@ public class ContextualCardLoader extends AsyncLoaderCompat<List<ContextualCard>
// Two large cards
return visibleCards;
} finally {
//TODO(b/121196921): Should not call this if user click dismiss
final ContextualCardFeatureProvider contextualCardFeatureProvider =
FeatureFactory.getFactory(mContext).getContextualCardFeatureProvider(mContext);
contextualCardFeatureProvider.logContextualCardDisplay(visibleCards, hiddenCards);
if (!CardContentProvider.DELETE_CARD_URI.equals(mNotifyUri)) {
final ContextualCardFeatureProvider contextualCardFeatureProvider =
FeatureFactory.getFactory(mContext)
.getContextualCardFeatureProvider(mContext);
contextualCardFeatureProvider.logContextualCardDisplay(visibleCards, hiddenCards);
}
}
}