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

Rename a bunch of stuff.

Browse Source 
For homepage cards, rename Homepage* to ContextualCard*.

Change-Id: I95740f15a1789683fa6c61f03ecf9bc47c367146
Fixes: 113966426
Test: robotests
This commit is contained in:
Fan Zhang
2018-09-06 17:45:50 -07:00
parent 21526c1f80
commit a746381401
15 changed files with 199 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/homepage/CardContentLoader.java
View File

@@ -32,7 +32,7 @@ public class CardContentLoader {
private CardContentLoaderListener mListener; private CardContentLoaderListener mListener;
public interface CardContentLoaderListener { public interface CardContentLoaderListener {
void onFinishCardLoading(List<HomepageCard> homepageCards); void onFinishCardLoading(List<ContextualCard> contextualCards);
} }
public CardContentLoader() { public CardContentLoader() {
@@ -42,20 +42,20 @@ public class CardContentLoader {
mListener = listener; mListener = listener;
} }
private static class CardLoader extends AsyncLoaderCompat<List<HomepageCard>> { private static class CardLoader extends AsyncLoaderCompat<List<ContextualCard>> {
public CardLoader(Context context) { public CardLoader(Context context) {
super(context); super(context);
} }
@Override @Override
protected void onDiscardResult(List<HomepageCard> result) { protected void onDiscardResult(List<ContextualCard> result) {
} }
@Nullable @Nullable
@Override @Override
public List<HomepageCard> loadInBackground() { public List<ContextualCard> loadInBackground() {
return null; return null;
} }
} }

16
src/com/android/settings/homepage/HomepageCard.java → src/com/android/settings/homepage/ContextualCard.java
View File

@@ -25,12 +25,12 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
/** /**
* Data class representing a {@link HomepageCard}. * Data class representing a {@link ContextualCard}.
*/ */
public class HomepageCard { public class ContextualCard {
/** /**
* Flags indicating the type of the HomepageCard. * Flags indicating the type of the ContextualCard.
*/ */
@IntDef({CardType.INVALID, CardType.SLICE, CardType.SUGGESTION, CardType.CONDITIONAL}) @IntDef({CardType.INVALID, CardType.SLICE, CardType.SUGGESTION, CardType.CONDITIONAL})
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@@ -137,7 +137,7 @@ public class HomepageCard {
return mIsHalfWidth; return mIsHalfWidth;
} }
public HomepageCard(Builder builder) { public ContextualCard(Builder builder) {
mName = builder.mName; mName = builder.mName;
mCardType = builder.mCardType; mCardType = builder.mCardType;
mRankingScore = builder.mRankingScore; mRankingScore = builder.mRankingScore;
@@ -171,10 +171,10 @@ public class HomepageCard {
if (this == obj) { if (this == obj) {
return true; return true;
} }
if (!(obj instanceof HomepageCard)) { if (!(obj instanceof ContextualCard)) {
return false; return false;
} }
final HomepageCard that = (HomepageCard) obj; final ContextualCard that = (ContextualCard) obj;
return TextUtils.equals(mName, that.mName); return TextUtils.equals(mName, that.mName);
} }
@@ -289,8 +289,8 @@ public class HomepageCard {
return this; return this;
} }
public HomepageCard build() { public ContextualCard build() {
return new HomepageCard(this); return new ContextualCard(this);
} }
} }
} }

16
src/com/android/settings/homepage/HomepageCardController.java → src/com/android/settings/homepage/ContextualCardController.java
View File

@@ -19,22 +19,22 @@ package com.android.settings.homepage;
import java.util.List; import java.util.List;
/** /**
* Data controller for {@link HomepageCard}. * Data controller for {@link ContextualCard}.
*/ */
public interface HomepageCardController { public interface ContextualCardController {
@HomepageCard.CardType @ContextualCard.CardType
int getCardType(); int getCardType();
/** /**
* When data is updated or changed, the new data should be passed to HomepageManager for list * When data is updated or changed, the new data should be passed to ContextualCardManager for list
* updating. * updating.
*/ */
void onDataUpdated(List<HomepageCard> cardList); void onDataUpdated(List<ContextualCard> cardList);
void onPrimaryClick(HomepageCard card); void onPrimaryClick(ContextualCard card);
void onActionClick(HomepageCard card); void onActionClick(ContextualCard card);
void setHomepageCardUpdateListener(HomepageCardUpdateListener listener); void setCardUpdateListener(ContextualCardUpdateListener listener);
} }

38
src/com/android/settings/homepage/HomepageCardLookupTable.java → src/com/android/settings/homepage/ContextualCardLookupTable.java
View File

@@ -16,43 +16,45 @@
package com.android.settings.homepage; package com.android.settings.homepage;
import com.android.settings.homepage.HomepageCard.CardType; import com.android.settings.homepage.ContextualCard.CardType;
import com.android.settings.homepage.conditional.ConditionHomepageCardController; import com.android.settings.homepage.conditional.ConditionContextualCardController;
import com.android.settings.homepage.conditional.ConditionHomepageCardRenderer; import com.android.settings.homepage.conditional.ConditionContextualCardRenderer;
import java.util.Set; import java.util.Set;
import java.util.TreeSet; import java.util.TreeSet;
public class HomepageCardLookupTable { public class ContextualCardLookupTable {
static class HomepageMapping implements Comparable<HomepageMapping> { static class ControllerRendererMapping implements Comparable<ControllerRendererMapping> {
@CardType @CardType
private final int mCardType; private final int mCardType;
private final Class<? extends HomepageCardController> mControllerClass; private final Class<? extends ContextualCardController> mControllerClass;
private final Class<? extends HomepageCardRenderer> mRendererClass; private final Class<? extends ContextualCardRenderer> mRendererClass;
private HomepageMapping(@CardType int cardType, private ControllerRendererMapping(@CardType int cardType,
Class<? extends HomepageCardController> controllerClass, Class<? extends ContextualCardController> controllerClass,
Class<? extends HomepageCardRenderer> rendererClass) { Class<? extends ContextualCardRenderer> rendererClass) {
mCardType = cardType; mCardType = cardType;
mControllerClass = controllerClass; mControllerClass = controllerClass;
mRendererClass = rendererClass; mRendererClass = rendererClass;
} }
@Override @Override
public int compareTo(HomepageMapping other) { public int compareTo(ControllerRendererMapping other) {
return Integer.compare(this.mCardType, other.mCardType); return Integer.compare(this.mCardType, other.mCardType);
} }
} }
private static final Set<HomepageMapping> LOOKUP_TABLE = new TreeSet<HomepageMapping>() {{ private static final Set<ControllerRendererMapping> LOOKUP_TABLE =
add(new HomepageMapping(CardType.CONDITIONAL, ConditionHomepageCardController.class, new TreeSet<ControllerRendererMapping>() {{
ConditionHomepageCardRenderer.class)); add(new ControllerRendererMapping(CardType.CONDITIONAL,
ConditionContextualCardController.class,
ConditionContextualCardRenderer.class));
}}; }};
public static Class<? extends HomepageCardController> getCardControllerClass( public static Class<? extends ContextualCardController> getCardControllerClass(
@CardType int cardType) { @CardType int cardType) {
for (HomepageMapping mapping : LOOKUP_TABLE) { for (ControllerRendererMapping mapping : LOOKUP_TABLE) {
if (mapping.mCardType == cardType) { if (mapping.mCardType == cardType) {
return mapping.mControllerClass; return mapping.mControllerClass;
} }
@@ -61,9 +63,9 @@ public class HomepageCardLookupTable {
} }
//TODO(b/112578070): Implement multi renderer cases. //TODO(b/112578070): Implement multi renderer cases.
public static Class<? extends HomepageCardRenderer> getCardRendererClasses( public static Class<? extends ContextualCardRenderer> getCardRendererClasses(
@CardType int cardType) { @CardType int cardType) {
for (HomepageMapping mapping : LOOKUP_TABLE) { for (ControllerRendererMapping mapping : LOOKUP_TABLE) {
if (mapping.mCardType == cardType) { if (mapping.mCardType == cardType) {
return mapping.mRendererClass; return mapping.mRendererClass;
} }

62
src/com/android/settings/homepage/HomepageManager.java → src/com/android/settings/homepage/ContextualCardManager.java
View File

@@ -26,37 +26,37 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
/** /**
* This is a centralized manager of multiple {@link HomepageCardController}. * This is a centralized manager of multiple {@link ContextualCardController}.
* *
* {@link HomepageManager} first loads data from {@link CardContentLoader} and gets back a list of * {@link ContextualCardManager} first loads data from {@link CardContentLoader} and gets back a list of
* {@link HomepageCard}. All subclasses of {@link HomepageCardController} are loaded here, which * {@link ContextualCard}. All subclasses of {@link ContextualCardController} are loaded here, which
* will then trigger the {@link HomepageCardController} to load its data and listen to * will then trigger the {@link ContextualCardController} to load its data and listen to
* corresponding changes. When every single {@link HomepageCardController} updates its data, the * corresponding changes. When every single {@link ContextualCardController} updates its data, the
* data will be passed here, then going through some sorting mechanisms. The * data will be passed here, then going through some sorting mechanisms. The
* {@link HomepageCardController} will end up building a list of {@link HomepageCard} for {@link * {@link ContextualCardController} will end up building a list of {@link ContextualCard} for {@link
* HomepageAdapter} and {@link BaseAdapter#notifyDataSetChanged()} will be called to get the page * ContextualCardsAdapter} and {@link BaseAdapter#notifyDataSetChanged()} will be called to get the page
* refreshed. * refreshed.
*/ */
public class HomepageManager implements CardContentLoader.CardContentLoaderListener, public class ContextualCardManager implements CardContentLoader.CardContentLoaderListener,
HomepageCardUpdateListener { ContextualCardUpdateListener {
private static final String TAG = "HomepageManager"; private static final String TAG = "ContextualCardManager";
//The list for Settings Custom Card //The list for Settings Custom Card
@HomepageCard.CardType @ContextualCard.CardType
private static final int[] SETTINGS_CARDS = {HomepageCard.CardType.CONDITIONAL}; private static final int[] SETTINGS_CARDS = {ContextualCard.CardType.CONDITIONAL};
private final Context mContext; private final Context mContext;
private final ControllerRendererPool mControllerRendererPool; private final ControllerRendererPool mControllerRendererPool;
private final Lifecycle mLifecycle; private final Lifecycle mLifecycle;
private List<HomepageCard> mHomepageCards; private List<ContextualCard> mContextualCards;
private HomepageCardUpdateListener mListener; private ContextualCardUpdateListener mListener;
public HomepageManager(Context context, Lifecycle lifecycle) { public ContextualCardManager(Context context, Lifecycle lifecycle) {
mContext = context; mContext = context;
mLifecycle = lifecycle; mLifecycle = lifecycle;
mHomepageCards = new ArrayList<>(); mContextualCards = new ArrayList<>();
mControllerRendererPool = new ControllerRendererPool(); mControllerRendererPool = new ControllerRendererPool();
} }
@@ -66,8 +66,8 @@ public class HomepageManager implements CardContentLoader.CardContentLoaderListe
} }
private void loadCardControllers() { private void loadCardControllers() {
if (mHomepageCards != null) { if (mContextualCards != null) {
for (HomepageCard card : mHomepageCards) { for (ContextualCard card : mContextualCards) {
setupController(card.getCardType()); setupController(card.getCardType());
} }
} }
@@ -79,10 +79,10 @@ public class HomepageManager implements CardContentLoader.CardContentLoaderListe
} }
private void setupController(int cardType) { private void setupController(int cardType) {
final HomepageCardController controller = mControllerRendererPool.getController(mContext, final ContextualCardController controller = mControllerRendererPool.getController(mContext,
cardType); cardType);
if (controller != null) { if (controller != null) {
controller.setHomepageCardUpdateListener(this); controller.setCardUpdateListener(this);
if (controller instanceof LifecycleObserver) { if (controller instanceof LifecycleObserver) {
if (mLifecycle != null) { if (mLifecycle != null) {
mLifecycle.addObserver((LifecycleObserver) controller); mLifecycle.addObserver((LifecycleObserver) controller);
@@ -93,35 +93,35 @@ public class HomepageManager implements CardContentLoader.CardContentLoaderListe
//TODO(b/111822376): implement sorting mechanism. //TODO(b/111822376): implement sorting mechanism.
private void sortCards() { private void sortCards() {
//take mHomepageCards as the source and do the ranking based on the rule. //take mContextualCards as the source and do the ranking based on the rule.
} }
@Override @Override
public void onHomepageCardUpdated(int cardType, List<HomepageCard> updateList) { public void onHomepageCardUpdated(int cardType, List<ContextualCard> updateList) {
//TODO(b/112245748): Should implement a DiffCallback. //TODO(b/112245748): Should implement a DiffCallback.
//Keep the old list for comparison. //Keep the old list for comparison.
final List<HomepageCard> prevCards = mHomepageCards; final List<ContextualCard> prevCards = mContextualCards;
//Remove the existing data that matches the certain cardType so as to insert the new data. //Remove the existing data that matches the certain cardType so as to insert the new data.
for (int i = mHomepageCards.size() - 1; i >= 0; i--) { for (int i = mContextualCards.size() - 1; i >= 0; i--) {
if (mHomepageCards.get(i).getCardType() == cardType) { if (mContextualCards.get(i).getCardType() == cardType) {
mHomepageCards.remove(i); mContextualCards.remove(i);
} }
} }
//Append the new data //Append the new data
mHomepageCards.addAll(updateList); mContextualCards.addAll(updateList);
sortCards(); sortCards();
if (mListener != null) { if (mListener != null) {
mListener.onHomepageCardUpdated(HomepageCard.CardType.INVALID, mHomepageCards); mListener.onHomepageCardUpdated(ContextualCard.CardType.INVALID, mContextualCards);
} }
} }
@Override @Override
public void onFinishCardLoading(List<HomepageCard> homepageCards) { public void onFinishCardLoading(List<ContextualCard> contextualCards) {
mHomepageCards = homepageCards; mContextualCards = contextualCards;
//Force card sorting here in case CardControllers of custom view have nothing to update //Force card sorting here in case CardControllers of custom view have nothing to update
// for the first launch. // for the first launch.
@@ -130,7 +130,7 @@ public class HomepageManager implements CardContentLoader.CardContentLoaderListe
loadCardControllers(); loadCardControllers();
} }
void setListener(HomepageCardUpdateListener listener) { void setListener(ContextualCardUpdateListener listener) {
mListener = listener; mListener = listener;
} }

10
src/com/android/settings/homepage/HomepageCardRenderer.java → src/com/android/settings/homepage/ContextualCardRenderer.java
View File

@@ -21,9 +21,9 @@ import android.view.View;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
/** /**
* UI renderer for {@link HomepageCard}. * UI renderer for {@link ContextualCard}.
*/ */
public interface HomepageCardRenderer { public interface ContextualCardRenderer {
/** /**
* The layout type of the controller. * The layout type of the controller.
@@ -31,16 +31,16 @@ public interface HomepageCardRenderer {
int getViewType(); int getViewType();
/** /**
* When {@link HomepageAdapter} calls {@link HomepageAdapter#onCreateViewHolder(ViewGroup, * When {@link ContextualCardsAdapter} calls {@link ContextualCardsAdapter#onCreateViewHolder(ViewGroup,
* int)}, this method will be called to retrieve the corresponding * int)}, this method will be called to retrieve the corresponding
* {@link androidx.recyclerview.widget.RecyclerView.ViewHolder}. * {@link androidx.recyclerview.widget.RecyclerView.ViewHolder}.
*/ */
RecyclerView.ViewHolder createViewHolder(View view); RecyclerView.ViewHolder createViewHolder(View view);
/** /**
* When {@link HomepageAdapter} calls {@link HomepageAdapter#onBindViewHolder(RecyclerView * When {@link ContextualCardsAdapter} calls {@link ContextualCardsAdapter#onBindViewHolder(RecyclerView
* .ViewHolder, int)}, this method will be called to bind data to the * .ViewHolder, int)}, this method will be called to bind data to the
* {@link androidx.recyclerview.widget.RecyclerView.ViewHolder}. * {@link androidx.recyclerview.widget.RecyclerView.ViewHolder}.
*/ */
void bindView(RecyclerView.ViewHolder holder, HomepageCard card); void bindView(RecyclerView.ViewHolder holder, ContextualCard card);
} }

12
src/com/android/settings/homepage/HomepageCardUpdateListener.java → src/com/android/settings/homepage/ContextualCardUpdateListener.java
View File

@@ -19,13 +19,13 @@ package com.android.settings.homepage;
import java.util.List; import java.util.List;
/** /**
* When {@link HomepageCardController} detects changes, it will notify the listeners registered. In * When {@link ContextualCardController} detects changes, it will notify the listeners registered. In
* our case, {@link HomepageManager} gets noticed. * our case, {@link ContextualCardManager} gets noticed.
* *
* After the list of {@link HomepageCard} gets updated in{@link HomepageManager}, * After the list of {@link ContextualCard} gets updated in{@link ContextualCardManager},
* {@link HomepageManager} will notify the listeners registered, {@link HomepageAdapter} in this * {@link ContextualCardManager} will notify the listeners registered, {@link ContextualCardsAdapter} in this
* case. * case.
*/ */
public interface HomepageCardUpdateListener { public interface ContextualCardUpdateListener {
void onHomepageCardUpdated(int cardType, List<HomepageCard> updateList); void onHomepageCardUpdated(int cardType, List<ContextualCard> updateList);
} }

36
src/com/android/settings/homepage/HomepageAdapter.java → src/com/android/settings/homepage/ContextualCardsAdapter.java
View File

@@ -27,39 +27,39 @@ import androidx.recyclerview.widget.RecyclerView;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
public class HomepageAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> implements public class ContextualCardsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> implements
HomepageCardUpdateListener { ContextualCardUpdateListener {
static final int SPAN_COUNT = 2; static final int SPAN_COUNT = 2;
private static final String TAG = "HomepageAdapter"; private static final String TAG = "ContextualCardsAdapter";
private static final int HALF_WIDTH = 1; private static final int HALF_WIDTH = 1;
private static final int FULL_WIDTH = 2; private static final int FULL_WIDTH = 2;
private final Context mContext; private final Context mContext;
private final ControllerRendererPool mControllerRendererPool; private final ControllerRendererPool mControllerRendererPool;
private List<HomepageCard> mHomepageCards; private List<ContextualCard> mContextualCards;
public HomepageAdapter(Context context, HomepageManager manager) { public ContextualCardsAdapter(Context context, ContextualCardManager manager) {
mContext = context; mContext = context;
mHomepageCards = new ArrayList<>(); mContextualCards = new ArrayList<>();
mControllerRendererPool = manager.getControllerRendererPool(); mControllerRendererPool = manager.getControllerRendererPool();
setHasStableIds(true); setHasStableIds(true);
} }
@Override @Override
public long getItemId(int position) { public long getItemId(int position) {
return mHomepageCards.get(position).hashCode(); return mContextualCards.get(position).hashCode();
} }
@Override @Override
public int getItemViewType(int position) { public int getItemViewType(int position) {
return mHomepageCards.get(position).getCardType(); return mContextualCards.get(position).getCardType();
} }
@Override @Override
public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int cardType) { public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int cardType) {
final HomepageCardRenderer renderer = mControllerRendererPool.getRenderer(mContext, final ContextualCardRenderer renderer = mControllerRendererPool.getRenderer(mContext,
cardType); cardType);
final int viewType = renderer.getViewType(); final int viewType = renderer.getViewType();
final View view = LayoutInflater.from(parent.getContext()).inflate(viewType, parent, false); final View view = LayoutInflater.from(parent.getContext()).inflate(viewType, parent, false);
@@ -69,16 +69,16 @@ public class HomepageAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
@Override @Override
public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) { public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
final int cardType = mHomepageCards.get(position).getCardType(); final int cardType = mContextualCards.get(position).getCardType();
final HomepageCardRenderer renderer = mControllerRendererPool.getRenderer(mContext, final ContextualCardRenderer renderer = mControllerRendererPool.getRenderer(mContext,
cardType); cardType);
renderer.bindView(holder, mHomepageCards.get(position)); renderer.bindView(holder, mContextualCards.get(position));
} }
@Override @Override
public int getItemCount() { public int getItemCount() {
return mHomepageCards.size(); return mContextualCards.size();
} }
@Override @Override
@@ -90,7 +90,7 @@ public class HomepageAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
gridLayoutManager.setSpanSizeLookup(new GridLayoutManager.SpanSizeLookup() { gridLayoutManager.setSpanSizeLookup(new GridLayoutManager.SpanSizeLookup() {
@Override @Override
public int getSpanSize(int position) { public int getSpanSize(int position) {
final HomepageCard card = mHomepageCards.get(position); final ContextualCard card = mContextualCards.get(position);
//TODO(b/114009676): may use another field to make decision. still under review. //TODO(b/114009676): may use another field to make decision. still under review.
if (card.isHalfWidth()) { if (card.isHalfWidth()) {
return HALF_WIDTH; return HALF_WIDTH;
@@ -102,13 +102,13 @@ public class HomepageAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
} }
@Override @Override
public void onHomepageCardUpdated(int cardType, List<HomepageCard> homepageCards) { public void onHomepageCardUpdated(int cardType, List<ContextualCard> contextualCards) {
//TODO(b/112245748): Should implement a DiffCallback so we can use notifyItemChanged() //TODO(b/112245748): Should implement a DiffCallback so we can use notifyItemChanged()
// instead. // instead.
if (homepageCards == null) { if (contextualCards == null) {
mHomepageCards.clear(); mContextualCards.clear();
} else { } else {
mHomepageCards = homepageCards; mContextualCards = contextualCards;
} }
notifyDataSetChanged(); notifyDataSetChanged();
} }

50
src/com/android/settings/homepage/ControllerRendererPool.java
View File

@@ -21,77 +21,77 @@ import android.util.Log;
import androidx.collection.ArraySet; import androidx.collection.ArraySet;
import com.android.settings.homepage.conditional.ConditionHomepageCardController; import com.android.settings.homepage.conditional.ConditionContextualCardController;
import com.android.settings.homepage.conditional.ConditionHomepageCardRenderer; import com.android.settings.homepage.conditional.ConditionContextualCardRenderer;
import java.util.Set; import java.util.Set;
/** /**
* This is a fragment scoped singleton holding a set of {@link HomepageCardController} and * This is a fragment scoped singleton holding a set of {@link ContextualCardController} and
* {@link HomepageCardRenderer}. * {@link ContextualCardRenderer}.
*/ */
public class ControllerRendererPool { public class ControllerRendererPool {
private static final String TAG = "ControllerRendererPool"; private static final String TAG = "ControllerRendererPool";
private final Set<HomepageCardController> mControllers; private final Set<ContextualCardController> mControllers;
private final Set<HomepageCardRenderer> mRenderers; private final Set<ContextualCardRenderer> mRenderers;
public ControllerRendererPool() { public ControllerRendererPool() {
mControllers = new ArraySet<>(); mControllers = new ArraySet<>();
mRenderers = new ArraySet<>(); mRenderers = new ArraySet<>();
} }
public <T extends HomepageCardController> T getController(Context context, public <T extends ContextualCardController> T getController(Context context,
@HomepageCard.CardType int cardType) { @ContextualCard.CardType int cardType) {
final Class<? extends HomepageCardController> clz = final Class<? extends ContextualCardController> clz =
HomepageCardLookupTable.getCardControllerClass(cardType); ContextualCardLookupTable.getCardControllerClass(cardType);
for (HomepageCardController controller : mControllers) { for (ContextualCardController controller : mControllers) {
if (controller.getClass() == clz) { if (controller.getClass() == clz) {
Log.d(TAG, "Controller is already there."); Log.d(TAG, "Controller is already there.");
return (T) controller; return (T) controller;
} }
} }
final HomepageCardController controller = createCardController(context, clz); final ContextualCardController controller = createCardController(context, clz);
if (controller != null) { if (controller != null) {
mControllers.add(controller); mControllers.add(controller);
} }
return (T) controller; return (T) controller;
} }
public Set<HomepageCardController> getControllers() { public Set<ContextualCardController> getControllers() {
return mControllers; return mControllers;
} }
public HomepageCardRenderer getRenderer(Context context, @HomepageCard.CardType int cardType) { public ContextualCardRenderer getRenderer(Context context, @ContextualCard.CardType int cardType) {
final Class<? extends HomepageCardRenderer> clz = final Class<? extends ContextualCardRenderer> clz =
HomepageCardLookupTable.getCardRendererClasses(cardType); ContextualCardLookupTable.getCardRendererClasses(cardType);
for (HomepageCardRenderer renderer : mRenderers) { for (ContextualCardRenderer renderer : mRenderers) {
if (renderer.getClass() == clz) { if (renderer.getClass() == clz) {
Log.d(TAG, "Renderer is already there."); Log.d(TAG, "Renderer is already there.");
return renderer; return renderer;
} }
} }
final HomepageCardRenderer renderer = createCardRenderer(context, clz); final ContextualCardRenderer renderer = createCardRenderer(context, clz);
if (renderer != null) { if (renderer != null) {
mRenderers.add(renderer); mRenderers.add(renderer);
} }
return renderer; return renderer;
} }
private HomepageCardController createCardController(Context context, private ContextualCardController createCardController(Context context,
Class<? extends HomepageCardController> clz) { Class<? extends ContextualCardController> clz) {
if (ConditionHomepageCardController.class == clz) { if (ConditionContextualCardController.class == clz) {
return new ConditionHomepageCardController(context); return new ConditionContextualCardController(context);
} }
return null; return null;
} }
private HomepageCardRenderer createCardRenderer(Context context, Class<?> clz) { private ContextualCardRenderer createCardRenderer(Context context, Class<?> clz) {
if (ConditionHomepageCardRenderer.class == clz) { if (ConditionContextualCardRenderer.class == clz) {
return new ConditionHomepageCardRenderer(context, this /*controllerRendererPool*/); return new ConditionContextualCardRenderer(context, this /*controllerRendererPool*/);
} }
return null; return null;
} }

18
src/com/android/settings/homepage/PersonalSettingsFragment.java
View File

@@ -16,7 +16,7 @@
package com.android.settings.homepage; package com.android.settings.homepage;
import static com.android.settings.homepage.HomepageAdapter.SPAN_COUNT; import static com.android.settings.homepage.ContextualCardsAdapter.SPAN_COUNT;
import android.os.Bundle; import android.os.Bundle;
import android.view.LayoutInflater; import android.view.LayoutInflater;
@@ -36,17 +36,15 @@ public class PersonalSettingsFragment extends InstrumentedFragment {
private static final String TAG = "PersonalSettingsFragment"; private static final String TAG = "PersonalSettingsFragment";
private RecyclerView mCardsContainer; private RecyclerView mCardsContainer;
//TODO(b/113966426): rename
private HomepageAdapter mHomepageAdapter;
private GridLayoutManager mLayoutManager; private GridLayoutManager mLayoutManager;
//TODO(b/113966426): rename private ContextualCardsAdapter mContextualCardsAdapter;
private HomepageManager mHomepageManager; private ContextualCardManager mContextualCardManager;
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
mHomepageManager = new HomepageManager(getContext(), getSettingsLifecycle()); mContextualCardManager = new ContextualCardManager(getContext(), getSettingsLifecycle());
mHomepageManager.startCardContentLoading(); mContextualCardManager.startCardContentLoading();
} }
@Override @Override
@@ -58,9 +56,9 @@ public class PersonalSettingsFragment extends InstrumentedFragment {
mLayoutManager = new GridLayoutManager(getActivity(), SPAN_COUNT, mLayoutManager = new GridLayoutManager(getActivity(), SPAN_COUNT,
LinearLayoutManager.VERTICAL, false /* reverseLayout */); LinearLayoutManager.VERTICAL, false /* reverseLayout */);
mCardsContainer.setLayoutManager(mLayoutManager); mCardsContainer.setLayoutManager(mLayoutManager);
mHomepageAdapter = new HomepageAdapter(getContext(), mHomepageManager); mContextualCardsAdapter = new ContextualCardsAdapter(getContext(), mContextualCardManager);
mCardsContainer.setAdapter(mHomepageAdapter); mCardsContainer.setAdapter(mContextualCardsAdapter);
mHomepageManager.setListener(mHomepageAdapter); mContextualCardManager.setListener(mContextualCardsAdapter);
return rootView; return rootView;
} }

41
src/com/android/settings/homepage/conditional/ConditionHomepageCardController.java → src/com/android/settings/homepage/conditional/ConditionContextualCardController.java
View File

@@ -18,9 +18,9 @@ package com.android.settings.homepage.conditional;
import android.content.Context; import android.content.Context;
import com.android.settings.homepage.HomepageCard; import com.android.settings.homepage.ContextualCard;
import com.android.settings.homepage.HomepageCardController; import com.android.settings.homepage.ContextualCardController;
import com.android.settings.homepage.HomepageCardUpdateListener; import com.android.settings.homepage.ContextualCardUpdateListener;
import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStart;
import com.android.settingslib.core.lifecycle.events.OnStop; import com.android.settingslib.core.lifecycle.events.OnStop;
@@ -32,32 +32,32 @@ import java.util.List;
* This controller triggers the loading of conditional cards and monitors state changes to * This controller triggers the loading of conditional cards and monitors state changes to
* update the homepage. * update the homepage.
*/ */
public class ConditionHomepageCardController implements HomepageCardController, ConditionListener, public class ConditionContextualCardController implements ContextualCardController,
LifecycleObserver, OnStart, OnStop { ConditionListener, LifecycleObserver, OnStart, OnStop {
private final Context mContext; private final Context mContext;
private final ConditionManager mConditionManager; private final ConditionManager mConditionManager;
private HomepageCardUpdateListener mListener; private ContextualCardUpdateListener mListener;
public ConditionHomepageCardController(Context context) { public ConditionContextualCardController(Context context) {
mContext = context; mContext = context;
mConditionManager = new ConditionManager(context.getApplicationContext(), this); mConditionManager = new ConditionManager(context.getApplicationContext(), this);
mConditionManager.startMonitoringStateChange(); mConditionManager.startMonitoringStateChange();
} }
@Override @Override
public void setHomepageCardUpdateListener(HomepageCardUpdateListener listener) { public void setCardUpdateListener(ContextualCardUpdateListener listener) {
mListener = listener; mListener = listener;
} }
@Override @Override
public int getCardType() { public int getCardType() {
return HomepageCard.CardType.CONDITIONAL; return ContextualCard.CardType.CONDITIONAL;
} }
@Override @Override
public void onDataUpdated(List<HomepageCard> cardList) { public void onDataUpdated(List<ContextualCard> cardList) {
mListener.onHomepageCardUpdated(getCardType(), cardList); mListener.onHomepageCardUpdated(getCardType(), cardList);
} }
@@ -72,33 +72,34 @@ public class ConditionHomepageCardController implements HomepageCardController,
} }
@Override @Override
public void onPrimaryClick(HomepageCard homepageCard) { public void onPrimaryClick(ContextualCard contextualCard) {
final ConditionCard card = (ConditionCard) homepageCard; final ConditionalContextualCard card = (ConditionalContextualCard) contextualCard;
mConditionManager.onPrimaryClick(mContext, card.getConditionId()); mConditionManager.onPrimaryClick(mContext, card.getConditionId());
} }
@Override @Override
public void onActionClick(HomepageCard homepageCard) { public void onActionClick(ContextualCard contextualCard) {
final ConditionCard card = (ConditionCard) homepageCard; final ConditionalContextualCard card = (ConditionalContextualCard) contextualCard;
mConditionManager.onActionClick(card.getConditionId()); mConditionManager.onActionClick(card.getConditionId());
} }
@Override @Override
public void onConditionsChanged() { public void onConditionsChanged() {
final List<HomepageCard> conditionCards = new ArrayList<>(); final List<ContextualCard> conditionCards = new ArrayList<>();
final List<ConditionalCard> conditionList = mConditionManager.getDisplayableCards(); final List<ConditionalCard> conditionList = mConditionManager.getDisplayableCards();
for (ConditionalCard condition : conditionList) { for (ConditionalCard condition : conditionList) {
final ConditionCard conditionCard = ((ConditionCard.Builder) new ConditionCard.Builder() final ContextualCard conditionCard =
new ConditionalContextualCard.Builder()
.setConditionId(condition.getId()) .setConditionId(condition.getId())
.setMetricsConstant(condition.getMetricsConstant()) .setMetricsConstant(condition.getMetricsConstant())
.setActionText(condition.getActionText()) .setActionText(condition.getActionText())
.setName(mContext.getPackageName() + "/" + condition.getTitle().toString()) .setName(mContext.getPackageName() + "/"
.setCardType(HomepageCard.CardType.CONDITIONAL) + condition.getTitle().toString())
.setCardType(ContextualCard.CardType.CONDITIONAL)
.setTitleText(condition.getTitle().toString()) .setTitleText(condition.getTitle().toString())
.setSummaryText(condition.getSummary().toString()) .setSummaryText(condition.getSummary().toString())
.setIconDrawable(condition.getIcon())) .setIconDrawable(condition.getIcon())
.build(); .build();
conditionCards.add(conditionCard); conditionCards.add(conditionCard);

20
src/com/android/settings/homepage/conditional/ConditionHomepageCardRenderer.java → src/com/android/settings/homepage/conditional/ConditionContextualCardRenderer.java
View File

@@ -27,21 +27,21 @@ import androidx.recyclerview.widget.RecyclerView;
import com.android.internal.logging.nano.MetricsProto; import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.homepage.ContextualCard;
import com.android.settings.homepage.ControllerRendererPool; import com.android.settings.homepage.ControllerRendererPool;
import com.android.settings.homepage.HomepageCard; import com.android.settings.homepage.ContextualCardRenderer;
import com.android.settings.homepage.HomepageCardRenderer;
import com.android.settings.overlay.FeatureFactory; import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
/** /**
* Card renderer for {@link ConditionCard}. * Card renderer for {@link ConditionalContextualCard}.
*/ */
public class ConditionHomepageCardRenderer implements HomepageCardRenderer { public class ConditionContextualCardRenderer implements ContextualCardRenderer {
private final Context mContext; private final Context mContext;
private final ControllerRendererPool mControllerRendererPool; private final ControllerRendererPool mControllerRendererPool;
public ConditionHomepageCardRenderer(Context context, public ConditionContextualCardRenderer(Context context,
ControllerRendererPool controllerRendererPool) { ControllerRendererPool controllerRendererPool) {
mContext = context; mContext = context;
mControllerRendererPool = controllerRendererPool; mControllerRendererPool = controllerRendererPool;
@@ -58,9 +58,9 @@ public class ConditionHomepageCardRenderer implements HomepageCardRenderer {
} }
@Override @Override
public void bindView(RecyclerView.ViewHolder holder, HomepageCard homepageCard) { public void bindView(RecyclerView.ViewHolder holder, ContextualCard contextualCard) {
final ConditionalCardHolder view = (ConditionalCardHolder) holder; final ConditionalCardHolder view = (ConditionalCardHolder) holder;
final ConditionCard card = (ConditionCard) homepageCard; final ConditionalContextualCard card = (ConditionalContextualCard) contextualCard;
final MetricsFeatureProvider metricsFeatureProvider = FeatureFactory.getFactory( final MetricsFeatureProvider metricsFeatureProvider = FeatureFactory.getFactory(
mContext).getMetricsFeatureProvider(); mContext).getMetricsFeatureProvider();
@@ -71,7 +71,7 @@ public class ConditionHomepageCardRenderer implements HomepageCardRenderer {
initializeActionButton(view, card, metricsFeatureProvider); initializeActionButton(view, card, metricsFeatureProvider);
} }
private void initializePrimaryClick(ConditionalCardHolder view, ConditionCard card, private void initializePrimaryClick(ConditionalCardHolder view, ConditionalContextualCard card,
MetricsFeatureProvider metricsFeatureProvider) { MetricsFeatureProvider metricsFeatureProvider) {
view.itemView.findViewById(R.id.content).setOnClickListener( view.itemView.findViewById(R.id.content).setOnClickListener(
v -> { v -> {
@@ -83,7 +83,7 @@ public class ConditionHomepageCardRenderer implements HomepageCardRenderer {
}); });
} }
private void initializeView(ConditionalCardHolder view, ConditionCard card) { private void initializeView(ConditionalCardHolder view, ConditionalContextualCard card) {
view.icon.setImageDrawable(card.getIconDrawable()); view.icon.setImageDrawable(card.getIconDrawable());
view.title.setText(card.getTitleText()); view.title.setText(card.getTitleText());
view.summary.setText(card.getSummaryText()); view.summary.setText(card.getSummaryText());
@@ -91,7 +91,7 @@ public class ConditionHomepageCardRenderer implements HomepageCardRenderer {
setViewVisibility(view.itemView, R.id.divider, false); setViewVisibility(view.itemView, R.id.divider, false);
} }
private void initializeActionButton(ConditionalCardHolder view, ConditionCard card, private void initializeActionButton(ConditionalCardHolder view, ConditionalContextualCard card,
MetricsFeatureProvider metricsFeatureProvider) { MetricsFeatureProvider metricsFeatureProvider) {
final CharSequence action = card.getActionText(); final CharSequence action = card.getActionText();
final boolean hasButtons = !TextUtils.isEmpty(action); final boolean hasButtons = !TextUtils.isEmpty(action);

16
src/com/android/settings/homepage/conditional/ConditionCard.java → src/com/android/settings/homepage/conditional/ConditionalContextualCard.java
View File

@@ -16,21 +16,21 @@
package com.android.settings.homepage.conditional; package com.android.settings.homepage.conditional;
import com.android.settings.homepage.HomepageCard; import com.android.settings.homepage.ContextualCard;
/** /**
* Data class representing a {@link ConditionCard}. * Data class representing a conditional {@link ContextualCard}.
* *
* Use this class to store additional attributes on top of {@link HomepageCard} for * Use this class to store additional attributes on top of {@link ContextualCard} for
* {@link ConditionalCard}. * {@link ConditionalCard}.
*/ */
public class ConditionCard extends HomepageCard { public class ConditionalContextualCard extends ContextualCard {
private final long mConditionId; private final long mConditionId;
private final int mMetricsConstant; private final int mMetricsConstant;
private final CharSequence mActionText; private final CharSequence mActionText;
private ConditionCard(Builder builder) { private ConditionalContextualCard(Builder builder) {
super(builder); super(builder);
mConditionId = builder.mConditionId; mConditionId = builder.mConditionId;
@@ -50,7 +50,7 @@ public class ConditionCard extends HomepageCard {
return mActionText; return mActionText;
} }
static class Builder extends HomepageCard.Builder { static class Builder extends ContextualCard.Builder {
private long mConditionId; private long mConditionId;
private int mMetricsConstant; private int mMetricsConstant;
@@ -71,8 +71,8 @@ public class ConditionCard extends HomepageCard {
return this; return this;
} }
public ConditionCard build() { public ConditionalContextualCard build() {
return new ConditionCard(this); return new ConditionalContextualCard(this);
} }
} }
} }

12
tests/robotests/src/com/android/settings/homepage/conditional/ConditionHomepageCardControllerTest.java → tests/robotests/src/com/android/settings/homepage/conditional/ConditionContextualCardControllerTest.java
View File

@@ -26,7 +26,7 @@ import android.content.Context;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.homepage.HomepageCardUpdateListener; import com.android.settings.homepage.ContextualCardUpdateListener;
import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before; import org.junit.Before;
@@ -41,20 +41,20 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class) @RunWith(SettingsRobolectricTestRunner.class)
public class ConditionHomepageCardControllerTest { public class ConditionContextualCardControllerTest {
@Mock @Mock
private ConditionManager mConditionManager; private ConditionManager mConditionManager;
@Mock @Mock
private HomepageCardUpdateListener mListener; private ContextualCardUpdateListener mListener;
private Context mContext; private Context mContext;
private ConditionHomepageCardController mController; private ConditionContextualCardController mController;
@Before @Before
public void setUp() { public void setUp() {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application); mContext = spy(RuntimeEnvironment.application);
mController = spy(new ConditionHomepageCardController(mContext)); mController = spy(new ConditionContextualCardController(mContext));
ReflectionHelpers.setField(mController, "mConditionManager", mConditionManager); ReflectionHelpers.setField(mController, "mConditionManager", mConditionManager);
} }
@@ -78,7 +78,7 @@ public class ConditionHomepageCardControllerTest {
final List<ConditionalCard> conditionalCards = new ArrayList<>(); final List<ConditionalCard> conditionalCards = new ArrayList<>();
conditionalCards.add(fakeConditionalCard); conditionalCards.add(fakeConditionalCard);
when(mConditionManager.getDisplayableCards()).thenReturn(conditionalCards); when(mConditionManager.getDisplayableCards()).thenReturn(conditionalCards);
mController.setHomepageCardUpdateListener(mListener); mController.setCardUpdateListener(mListener);
mController.onConditionsChanged(); mController.onConditionsChanged();

29
tests/robotests/src/com/android/settings/homepage/conditional/ConditionHomepageCardRendererTest.java → tests/robotests/src/com/android/settings/homepage/conditional/ConditionContextualCardRendererTest.java
View File

@@ -31,8 +31,8 @@ import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.homepage.ContextualCard;
import com.android.settings.homepage.ControllerRendererPool; import com.android.settings.homepage.ControllerRendererPool;
import com.android.settings.homepage.HomepageCard;
import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before; import org.junit.Before;
@@ -43,20 +43,20 @@ import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment; import org.robolectric.RuntimeEnvironment;
@RunWith(SettingsRobolectricTestRunner.class) @RunWith(SettingsRobolectricTestRunner.class)
public class ConditionHomepageCardRendererTest { public class ConditionContextualCardRendererTest {
@Mock @Mock
private ControllerRendererPool mControllerRendererPool; private ControllerRendererPool mControllerRendererPool;
@Mock @Mock
private ConditionHomepageCardController mController; private ConditionContextualCardController mController;
private Context mContext; private Context mContext;
private ConditionHomepageCardRenderer mRenderer; private ConditionContextualCardRenderer mRenderer;
@Before @Before
public void setUp() { public void setUp() {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application); mContext = spy(RuntimeEnvironment.application);
mRenderer = new ConditionHomepageCardRenderer(mContext, mControllerRendererPool); mRenderer = new ConditionContextualCardRenderer(mContext, mControllerRendererPool);
} }
@Test @Test
@@ -68,9 +68,9 @@ public class ConditionHomepageCardRendererTest {
final RecyclerView.ViewHolder viewHolder = mRenderer.createViewHolder(view); final RecyclerView.ViewHolder viewHolder = mRenderer.createViewHolder(view);
final View card = view.findViewById(R.id.content); final View card = view.findViewById(R.id.content);
when(mControllerRendererPool.getController(mContext, when(mControllerRendererPool.getController(mContext,
HomepageCard.CardType.CONDITIONAL)).thenReturn(mController); ContextualCard.CardType.CONDITIONAL)).thenReturn(mController);
mRenderer.bindView(viewHolder, getHomepageCard()); mRenderer.bindView(viewHolder, buildConditionContextualCard());
assertThat(card).isNotNull(); assertThat(card).isNotNull();
assertThat(card.hasOnClickListeners()).isTrue(); assertThat(card.hasOnClickListeners()).isTrue();
@@ -85,28 +85,27 @@ public class ConditionHomepageCardRendererTest {
final RecyclerView.ViewHolder viewHolder = mRenderer.createViewHolder(view); final RecyclerView.ViewHolder viewHolder = mRenderer.createViewHolder(view);
final View card = view.findViewById(R.id.content); final View card = view.findViewById(R.id.content);
when(mControllerRendererPool.getController(mContext, when(mControllerRendererPool.getController(mContext,
HomepageCard.CardType.CONDITIONAL)).thenReturn(mController); ContextualCard.CardType.CONDITIONAL)).thenReturn(mController);
mRenderer.bindView(viewHolder, getHomepageCard()); mRenderer.bindView(viewHolder, buildConditionContextualCard());
assertThat(card).isNotNull(); assertThat(card).isNotNull();
card.performClick(); card.performClick();
verify(mController).onPrimaryClick(any(HomepageCard.class)); verify(mController).onPrimaryClick(any(ContextualCard.class));
} }
private HomepageCard getHomepageCard() { private ContextualCard buildConditionContextualCard() {
ConditionCard conditionCard = ((ConditionCard.Builder) new ConditionCard.Builder() return new ConditionalContextualCard.Builder()
.setConditionId(123) .setConditionId(123)
.setMetricsConstant(1) .setMetricsConstant(1)
.setActionText("test_action") .setActionText("test_action")
.setName("test_name") .setName("test_name")
.setCardType(HomepageCard.CardType.CONDITIONAL) .setCardType(ContextualCard.CardType.CONDITIONAL)
.setTitleText("test_title") .setTitleText("test_title")
.setSummaryText("test_summary") .setSummaryText("test_summary")
.setIconDrawable(mContext.getDrawable(R.drawable.ic_do_not_disturb_on_24dp)) .setIconDrawable(mContext.getDrawable(R.drawable.ic_do_not_disturb_on_24dp))
.setIsHalfWidth(true)) .setIsHalfWidth(true)
.build(); .build();
return conditionCard;
} }
} }