From 089ed2152607b3944401ad4e374ed2dd67c62ab7 Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Wed, 12 Sep 2018 14:07:12 -0700 Subject: [PATCH] Fix nits in contextual card package. We missed to catch a few nits in previous CLs. This change cleans up some of it. Test: manual Change-Id: Ibd3466f781952f998e1183a49f56e812cbce99a1 --- .../settings/homepage/CardContentLoader.java | 30 ++++++++----------- .../settings/homepage/CardDatabaseHelper.java | 2 +- .../homepage/ContextualCardController.java | 4 +-- .../homepage/ContextualCardManager.java | 3 +- .../homepage/ContextualCardRenderer.java | 8 ++--- .../homepage/ContextualCardsAdapter.java | 4 +-- .../homepage/PersonalSettingsFragment.java | 2 +- 7 files changed, 23 insertions(+), 30 deletions(-) diff --git a/src/com/android/settings/homepage/CardContentLoader.java b/src/com/android/settings/homepage/CardContentLoader.java index 2a2ebad6f58..9805ae3e409 100644 --- a/src/com/android/settings/homepage/CardContentLoader.java +++ b/src/com/android/settings/homepage/CardContentLoader.java @@ -19,7 +19,7 @@ package com.android.settings.homepage; import android.content.Context; import android.database.Cursor; -import androidx.annotation.Nullable; +import androidx.annotation.NonNull; import com.android.settingslib.utils.AsyncLoaderCompat; @@ -45,28 +45,22 @@ public class CardContentLoader extends AsyncLoaderCompat> { } - @Nullable + @NonNull @Override public List loadInBackground() { - List result; - try (Cursor cursor = CardDatabaseHelper.getInstance(mContext).getAllContextualCards()) { + final List result = new ArrayList<>(); + try (Cursor cursor = CardDatabaseHelper.getInstance(mContext).getContextualCards()) { if (cursor.getCount() == 0) { //TODO(b/113372471): Load Default static cards and return 3 static cards - return new ArrayList<>(); + return result; } - result = buildContextualCardList(cursor); - } - return result; - } - - private List buildContextualCardList(Cursor cursor) { - final List result = new ArrayList<>(); - for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) { - final ContextualCard card = new ContextualCard(cursor); - if (card.isCustomCard()) { - //TODO(b/114688391): Load and generate custom card,then add into list - } else { - result.add(card); + for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) { + final ContextualCard card = new ContextualCard(cursor); + if (card.isCustomCard()) { + //TODO(b/114688391): Load and generate custom card,then add into list + } else { + result.add(card); + } } } return result; diff --git a/src/com/android/settings/homepage/CardDatabaseHelper.java b/src/com/android/settings/homepage/CardDatabaseHelper.java index f0a347187ae..b53479ec5f2 100644 --- a/src/com/android/settings/homepage/CardDatabaseHelper.java +++ b/src/com/android/settings/homepage/CardDatabaseHelper.java @@ -192,7 +192,7 @@ public class CardDatabaseHelper extends SQLiteOpenHelper { return sCardDatabaseHelper; } - Cursor getAllContextualCards() { + Cursor getContextualCards() { final SQLiteDatabase db = this.getReadableDatabase(); Cursor cursor = db.query(CARD_TABLE, null /* columns */, null /* selection */, null /* selectionArgs */, null /* groupBy */, null /* having */, diff --git a/src/com/android/settings/homepage/ContextualCardController.java b/src/com/android/settings/homepage/ContextualCardController.java index 921d72bda8a..4a7a1498bf5 100644 --- a/src/com/android/settings/homepage/ContextualCardController.java +++ b/src/com/android/settings/homepage/ContextualCardController.java @@ -27,8 +27,8 @@ public interface ContextualCardController { int getCardType(); /** - * When data is updated or changed, the new data should be passed to ContextualCardManager for list - * updating. + * When data is updated or changed, the new data should be passed to ContextualCardManager for + * list updating. */ void onDataUpdated(List cardList); diff --git a/src/com/android/settings/homepage/ContextualCardManager.java b/src/com/android/settings/homepage/ContextualCardManager.java index df20a6c2a4a..1eec6a7af98 100644 --- a/src/com/android/settings/homepage/ContextualCardManager.java +++ b/src/com/android/settings/homepage/ContextualCardManager.java @@ -68,7 +68,7 @@ public class ContextualCardManager implements CardContentLoader.CardContentLoade mControllerRendererPool = new ControllerRendererPool(); } - void startCardContentLoading(PersonalSettingsFragment fragment) { + void loadContextualCards(PersonalSettingsFragment fragment) { final CardContentLoaderCallbacks cardContentLoaderCallbacks = new CardContentLoaderCallbacks(mContext); cardContentLoaderCallbacks.setListener(this); @@ -152,7 +152,6 @@ public class ContextualCardManager implements CardContentLoader.CardContentLoade return mControllerRendererPool; } - static class CardContentLoaderCallbacks implements LoaderManager.LoaderCallbacks> { diff --git a/src/com/android/settings/homepage/ContextualCardRenderer.java b/src/com/android/settings/homepage/ContextualCardRenderer.java index 94fdb438f9e..315c09d93ca 100644 --- a/src/com/android/settings/homepage/ContextualCardRenderer.java +++ b/src/com/android/settings/homepage/ContextualCardRenderer.java @@ -31,15 +31,15 @@ public interface ContextualCardRenderer { int getViewType(); /** - * When {@link ContextualCardsAdapter} calls {@link ContextualCardsAdapter#onCreateViewHolder(ViewGroup, - * int)}, this method will be called to retrieve the corresponding + * When {@link ContextualCardsAdapter} calls {@link ContextualCardsAdapter#onCreateViewHolder}, + * this method will be called to retrieve the corresponding * {@link androidx.recyclerview.widget.RecyclerView.ViewHolder}. */ RecyclerView.ViewHolder createViewHolder(View view); /** - * When {@link ContextualCardsAdapter} calls {@link ContextualCardsAdapter#onBindViewHolder(RecyclerView - * .ViewHolder, int)}, this method will be called to bind data to the + * When {@link ContextualCardsAdapter} calls {@link ContextualCardsAdapter#onBindViewHolder}, + * this method will be called to bind data to the * {@link androidx.recyclerview.widget.RecyclerView.ViewHolder}. */ void bindView(RecyclerView.ViewHolder holder, ContextualCard card); diff --git a/src/com/android/settings/homepage/ContextualCardsAdapter.java b/src/com/android/settings/homepage/ContextualCardsAdapter.java index e985343cd59..53a47e0fb0d 100644 --- a/src/com/android/settings/homepage/ContextualCardsAdapter.java +++ b/src/com/android/settings/homepage/ContextualCardsAdapter.java @@ -27,8 +27,8 @@ import androidx.recyclerview.widget.RecyclerView; import java.util.ArrayList; import java.util.List; -public class ContextualCardsAdapter extends RecyclerView.Adapter implements - ContextualCardUpdateListener { +public class ContextualCardsAdapter extends RecyclerView.Adapter + implements ContextualCardUpdateListener { static final int SPAN_COUNT = 2; private static final String TAG = "ContextualCardsAdapter"; diff --git a/src/com/android/settings/homepage/PersonalSettingsFragment.java b/src/com/android/settings/homepage/PersonalSettingsFragment.java index da41cd72f68..4a0041ea19d 100644 --- a/src/com/android/settings/homepage/PersonalSettingsFragment.java +++ b/src/com/android/settings/homepage/PersonalSettingsFragment.java @@ -43,7 +43,7 @@ public class PersonalSettingsFragment extends InstrumentedFragment { public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); mContextualCardManager = new ContextualCardManager(getContext(), getSettingsLifecycle()); - mContextualCardManager.startCardContentLoading(this); + mContextualCardManager.loadContextualCards(this); } @Override