suggestions) {
+ if (suggestions == null || mSuggestionConditionMode == HEADER_MODE_COLLAPSED) {
+ return null;
+ }
+ if (mSuggestionConditionMode != HEADER_MODE_DEFAULT
+ || suggestions.size() <= DEFAULT_SUGGESTION_COUNT) {
+ return suggestions;
+ }
+ return suggestions.subList(0, DEFAULT_SUGGESTION_COUNT);
+ }
+
/**
* Builder used to build the ItemsData
*
- * {@link #mExpandedCondition} and {@link #mSuggestionMode} have default value
- * while others are not.
+ * {@link #mExpandedCondition}, {@link #mSuggestionConditionMode} and {@link #mSuggestionMode}
+ * have default value while others are not.
*/
public static class Builder {
+ @Deprecated
private int mSuggestionMode = SUGGESTION_MODE_DEFAULT;
+ @Deprecated
private Condition mExpandedCondition = null;
+ private @HeaderMode int mSuggestionConditionMode = HEADER_MODE_DEFAULT;
private List mCategories;
private List mConditions;
private List mSuggestions;
+ private boolean mCombineSuggestionAndCondition;
public Builder() {
}
@@ -308,6 +439,8 @@ public class DashboardData {
mSuggestions = dashboardData.mSuggestions;
mSuggestionMode = dashboardData.mSuggestionMode;
mExpandedCondition = dashboardData.mExpandedCondition;
+ mSuggestionConditionMode = dashboardData.mSuggestionConditionMode;
+ mCombineSuggestionAndCondition = dashboardData.mCombineSuggestionAndCondition;
}
public Builder setCategories(List categories) {
@@ -330,11 +463,22 @@ public class DashboardData {
return this;
}
+ @Deprecated
public Builder setExpandedCondition(Condition expandedCondition) {
this.mExpandedCondition = expandedCondition;
return this;
}
+ public Builder setSuggestionConditionMode(@HeaderMode int mode) {
+ this.mSuggestionConditionMode = mode;
+ return this;
+ }
+
+ public Builder setCombineSuggestionAndCondition(boolean combine) {
+ this.mCombineSuggestionAndCondition = combine;
+ return this;
+ }
+
public DashboardData build() {
return new DashboardData(this);
}
@@ -373,6 +517,8 @@ public class DashboardData {
return mOldItems.get(oldItemPosition).equals(mNewItems.get(newItemPosition));
}
+ // not needed in combined UI
+ @Deprecated
@Nullable
@Override
public Object getChangePayload(int oldItemPosition, int newItemPosition) {
@@ -390,13 +536,24 @@ public class DashboardData {
// valid types in field type
private static final int TYPE_DASHBOARD_CATEGORY = R.layout.dashboard_category;
private static final int TYPE_DASHBOARD_TILE = R.layout.dashboard_tile;
+ @Deprecated
private static final int TYPE_SUGGESTION_HEADER = R.layout.suggestion_header;
+ @Deprecated
private static final int TYPE_SUGGESTION_TILE = R.layout.suggestion_tile;
+ private static final int TYPE_SUGGESTION_CONDITION_CONTAINER =
+ R.layout.suggestion_condition_container;
+ private static final int TYPE_SUGGESTION_CONDITION_HEADER =
+ R.layout.suggestion_condition_header;
+ @Deprecated
private static final int TYPE_CONDITION_CARD = R.layout.condition_card;
+ private static final int TYPE_SUGGESTION_CONDITION_FOOTER =
+ R.layout.suggestion_condition_footer;
private static final int TYPE_DASHBOARD_SPACER = R.layout.dashboard_spacer;
@IntDef({TYPE_DASHBOARD_CATEGORY, TYPE_DASHBOARD_TILE, TYPE_SUGGESTION_HEADER,
- TYPE_SUGGESTION_TILE, TYPE_CONDITION_CARD, TYPE_DASHBOARD_SPACER})
+ TYPE_SUGGESTION_TILE, TYPE_SUGGESTION_CONDITION_CONTAINER,
+ TYPE_SUGGESTION_CONDITION_HEADER, TYPE_CONDITION_CARD,
+ TYPE_SUGGESTION_CONDITION_FOOTER, TYPE_DASHBOARD_SPACER})
@Retention(RetentionPolicy.SOURCE)
public @interface ItemTypes{}
@@ -422,8 +579,10 @@ public class DashboardData {
* To store whether the condition is expanded, useless when {@link #type} is not
* {@link #TYPE_CONDITION_CARD}
*/
+ @Deprecated
public final boolean conditionExpanded;
+ @Deprecated
public Item(Object entity, @ItemTypes int type, int id, boolean conditionExpanded) {
this.entity = entity;
this.type = type;
@@ -431,6 +590,10 @@ public class DashboardData {
this.conditionExpanded = conditionExpanded;
}
+ public Item(Object entity, @ItemTypes int type, int id) {
+ this(entity, type, id, false);
+ }
+
/**
* Override it to make comparision in the {@link ItemsDataDiffCallback}
* @param obj object to compared with
@@ -516,4 +679,27 @@ public class DashboardData {
}
}
+ /**
+ * This class contains the data needed to build the suggestion/condition header. The data can
+ * also be used to check the diff in DiffUtil.Callback
+ */
+ public static class SuggestionConditionHeaderData {
+ public final List conditionIcons;
+ public final CharSequence title;
+ public final int conditionCount;
+ public final int hiddenSuggestionCount;
+
+ public SuggestionConditionHeaderData(List conditions,
+ int hiddenSuggestionCount) {
+ conditionCount = sizeOf(conditions);
+ this.hiddenSuggestionCount = hiddenSuggestionCount;
+ title = conditionCount > 0 ? conditions.get(0).getTitle() : null;
+ conditionIcons = new ArrayList();
+ for (int i = 0; conditions != null && i < conditions.size(); i++) {
+ final Condition condition = conditions.get(i);
+ conditionIcons.add(condition.getIcon());
+ }
+ }
+ }
+
}
\ No newline at end of file
diff --git a/src/com/android/settings/dashboard/DashboardFeatureProvider.java b/src/com/android/settings/dashboard/DashboardFeatureProvider.java
index 15608a27bee..939a5d61ff3 100644
--- a/src/com/android/settings/dashboard/DashboardFeatureProvider.java
+++ b/src/com/android/settings/dashboard/DashboardFeatureProvider.java
@@ -95,4 +95,9 @@ public interface DashboardFeatureProvider {
*/
void openTileIntent(Activity activity, Tile tile);
+ /**
+ * Whether or not we should use new UI that combines the settings suggestions and conditions.
+ */
+ boolean combineSuggestionAndCondition();
+
}
diff --git a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
index 88cf6664297..dcae3224630 100644
--- a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
+++ b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
@@ -206,6 +206,11 @@ public class DashboardFeatureProviderImpl implements DashboardFeatureProvider {
launchIntentOrSelectProfile(activity, tile, intent, MetricsEvent.DASHBOARD_SUMMARY);
}
+ @Override
+ public boolean combineSuggestionAndCondition() {
+ return false;
+ }
+
private void launchIntentOrSelectProfile(Activity activity, Tile tile, Intent intent,
int sourceMetricCategory) {
if (!isIntentResolvable(intent)) {
diff --git a/src/com/android/settings/dashboard/DashboardSummary.java b/src/com/android/settings/dashboard/DashboardSummary.java
index 9f6c61cda2e..7bd11f50a26 100644
--- a/src/com/android/settings/dashboard/DashboardSummary.java
+++ b/src/com/android/settings/dashboard/DashboardSummary.java
@@ -196,13 +196,16 @@ public class DashboardSummary extends InstrumentedFragment
mDashboard.addItemDecoration(new DashboardDecorator(getContext()));
mDashboard.setListener(this);
Log.d(TAG, "adapter created");
- mAdapter = new DashboardAdapter(getContext(), bundle, mConditionManager.getConditions());
+ mAdapter = new DashboardAdapter(getContext(), bundle, mConditionManager.getConditions(),
+ mSuggestionParser, this /* SuggestionDismissController.Callback */);
mDashboard.setAdapter(mAdapter);
- mSuggestionDismissHandler = new SuggestionDismissController(
+ if (!mDashboardFeatureProvider.combineSuggestionAndCondition()) {
+ mSuggestionDismissHandler = new SuggestionDismissController(
getContext(), mDashboard, mSuggestionParser, this);
+ ConditionAdapterUtils.addDismiss(mDashboard);
+ }
mDashboard.setItemAnimator(new DashboardItemAnimator());
mSummaryLoader.setSummaryConsumer(mAdapter);
- ConditionAdapterUtils.addDismiss(mDashboard);
if (DEBUG_TIMING) {
Log.d(TAG, "onViewCreated took "
+ (System.currentTimeMillis() - startTime) + " ms");
@@ -242,7 +245,7 @@ public class DashboardSummary extends InstrumentedFragment
@Override
public Tile getSuggestionForPosition(int position) {
- return (Tile) mAdapter.getItem(mAdapter.getItemId(position));
+ return mAdapter.getSuggestion(position);
}
@Override
diff --git a/src/com/android/settings/dashboard/conditional/ConditionAdapter.java b/src/com/android/settings/dashboard/conditional/ConditionAdapter.java
new file mode 100644
index 00000000000..5827d14e151
--- /dev/null
+++ b/src/com/android/settings/dashboard/conditional/ConditionAdapter.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.dashboard.conditional;
+
+import android.content.Context;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.R;
+import com.android.settings.core.instrumentation.MetricsFeatureProvider;
+import com.android.settings.dashboard.DashboardAdapter.DashboardItemHolder;
+import com.android.settings.dashboard.DashboardData;
+import com.android.settings.dashboard.DashboardData.HeaderMode;
+import com.android.settings.overlay.FeatureFactory;
+import java.util.List;
+import java.util.Objects;
+
+public class ConditionAdapter extends RecyclerView.Adapter {
+ public static final String TAG = "ConditionAdapter";
+
+ private final Context mContext;
+ private final MetricsFeatureProvider mMetricsFeatureProvider;
+ private List mConditions;
+ private @HeaderMode int mMode;
+
+ private View.OnClickListener mConditionClickListener = new View.OnClickListener() {
+
+ @Override
+ public void onClick(View v) {
+ //TODO: get rid of setTag/getTag
+ Condition condition = (Condition) v.getTag();
+ mMetricsFeatureProvider.action(mContext,
+ MetricsEvent.ACTION_SETTINGS_CONDITION_CLICK,
+ condition.getMetricsConstant());
+ condition.onPrimaryClick();
+ }
+ };
+
+ public ConditionAdapter(Context context, List conditions, @HeaderMode int mode) {
+ mContext = context;
+ mConditions = conditions;
+ mMode = mode;
+ mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
+
+ setHasStableIds(true);
+ }
+
+ public Object getItem(long itemId) {
+ for (Condition condition : mConditions) {
+ if (Objects.hash(condition.getTitle()) == itemId) {
+ return condition;
+ }
+ }
+ return null;
+ }
+
+ @Override
+ public DashboardItemHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+ return new DashboardItemHolder(LayoutInflater.from(parent.getContext()).inflate(
+ viewType, parent, false));
+ }
+
+ @Override
+ public void onBindViewHolder(DashboardItemHolder holder, int position) {
+ // TODO: merge methods from ConditionAdapterUtils into this class
+ ConditionAdapterUtils.bindViews(mConditions.get(position), holder,
+ position == mConditions.size() - 1, mConditionClickListener);
+ }
+
+ @Override
+ public long getItemId(int position) {
+ return Objects.hash(mConditions.get(position).getTitle());
+ }
+
+ @Override
+ public int getItemViewType(int position) {
+ return R.layout.condition_tile_new_ui;
+ }
+
+ @Override
+ public int getItemCount() {
+ if (mMode == DashboardData.HEADER_MODE_FULLY_EXPANDED) {
+ return mConditions.size();
+ }
+ return 0;
+ }
+
+}
diff --git a/src/com/android/settings/dashboard/conditional/ConditionAdapterUtils.java b/src/com/android/settings/dashboard/conditional/ConditionAdapterUtils.java
index aebbf931c81..0e25723304d 100644
--- a/src/com/android/settings/dashboard/conditional/ConditionAdapterUtils.java
+++ b/src/com/android/settings/dashboard/conditional/ConditionAdapterUtils.java
@@ -44,22 +44,28 @@ public class ConditionAdapterUtils {
@Override
public int getSwipeDirs(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
return viewHolder.getItemViewType() == R.layout.condition_card
+ || viewHolder.getItemViewType() == R.layout.condition_tile_new_ui
? super.getSwipeDirs(recyclerView, viewHolder) : 0;
}
@Override
public void onSwiped(RecyclerView.ViewHolder viewHolder, int direction) {
- DashboardAdapter adapter = (DashboardAdapter) recyclerView.getAdapter();
- Object item = adapter.getItem(viewHolder.getItemId());
- if (item instanceof Condition) {
- ((Condition) item).silence();
+ Object item;
+ if (viewHolder.getItemViewType() == R.layout.condition_card) {
+ DashboardAdapter adapter = (DashboardAdapter) recyclerView.getAdapter();
+ item = adapter.getItem(viewHolder.getItemId());
+ } else {
+ ConditionAdapter adapter = (ConditionAdapter) recyclerView.getAdapter();
+ item = adapter.getItem(viewHolder.getItemId());
}
+ ((Condition) item).silence();
}
};
ItemTouchHelper itemTouchHelper = new ItemTouchHelper(callback);
itemTouchHelper.attachToRecyclerView(recyclerView);
}
+ @Deprecated
public static void bindViews(final Condition condition,
DashboardAdapter.DashboardItemHolder view, boolean isExpanded,
View.OnClickListener onClickListener, View.OnClickListener onExpandListener) {
@@ -121,6 +127,49 @@ public class ConditionAdapterUtils {
}
}
+ public static void bindViews(final Condition condition,
+ DashboardAdapter.DashboardItemHolder view, boolean isLastItem,
+ View.OnClickListener onClickListener) {
+ if (condition instanceof AirplaneModeCondition) {
+ Log.d(TAG, "Airplane mode condition has been bound with "
+ + "isActive=" + condition.isActive() + ". Airplane mode is currently " +
+ WirelessUtils.isAirplaneModeOn(condition.mManager.getContext()));
+ }
+ View card = view.itemView.findViewById(R.id.content);
+ card.setTag(condition);
+ card.setOnClickListener(onClickListener);
+ view.icon.setImageIcon(condition.getIcon());
+ view.title.setText(condition.getTitle());
+
+ CharSequence[] actions = condition.getActions();
+ final boolean hasButtons = actions.length > 0;
+ setViewVisibility(view.itemView, R.id.buttonBar, hasButtons);
+
+ view.summary.setText(condition.getSummary());
+ for (int i = 0; i < 2; i++) {
+ Button button = (Button) view.itemView.findViewById(i == 0
+ ? R.id.first_action : R.id.second_action);
+ if (actions.length > i) {
+ button.setVisibility(View.VISIBLE);
+ button.setText(actions[i]);
+ final int index = i;
+ button.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ Context context = v.getContext();
+ FeatureFactory.getFactory(context).getMetricsFeatureProvider()
+ .action(context, MetricsEvent.ACTION_SETTINGS_CONDITION_BUTTON,
+ condition.getMetricsConstant());
+ condition.onActionClick(index);
+ }
+ });
+ } else {
+ button.setVisibility(View.GONE);
+ }
+ }
+ setViewVisibility(view.itemView, R.id.divider, !isLastItem);
+ }
+
private static void setViewVisibility(View containerView, int viewId, boolean visible) {
View view = containerView.findViewById(viewId);
if (view != null) {
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java b/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java
new file mode 100644
index 00000000000..3335950d70e
--- /dev/null
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java
@@ -0,0 +1,135 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.dashboard.suggestions;
+
+import android.content.Context;
+import android.support.v7.widget.RecyclerView;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.R;
+import com.android.settings.R.layout;
+import com.android.settings.SettingsActivity;
+import com.android.settings.core.instrumentation.MetricsFeatureProvider;
+import com.android.settings.dashboard.DashboardAdapter.DashboardItemHolder;
+import com.android.settings.dashboard.DashboardAdapter.IconCache;
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.drawer.Tile;
+import java.util.List;
+import java.util.Objects;
+
+public class SuggestionAdapter extends RecyclerView.Adapter {
+ public static final String TAG = "SuggestionAdapter";
+
+ private final Context mContext;
+ private final MetricsFeatureProvider mMetricsFeatureProvider;
+ private final SuggestionFeatureProvider mSuggestionFeatureProvider;
+ private List mSuggestions;
+ private final IconCache mCache;
+ private final List mSuggestionsShownLogged;
+
+ public SuggestionAdapter(Context context, List suggestions,
+ List suggestionsShownLogged) {
+ mContext = context;
+ mSuggestions = suggestions;
+ mSuggestionsShownLogged = suggestionsShownLogged;
+ mCache = new IconCache(context);
+ final FeatureFactory factory = FeatureFactory.getFactory(context);
+ mMetricsFeatureProvider = factory.getMetricsFeatureProvider();
+ mSuggestionFeatureProvider = factory.getSuggestionFeatureProvider(context);
+
+ setHasStableIds(true);
+ }
+
+ @Override
+ public DashboardItemHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+ return new DashboardItemHolder(LayoutInflater.from(parent.getContext()).inflate(
+ viewType, parent, false));
+ }
+
+ @Override
+ public void onBindViewHolder(DashboardItemHolder holder, int position) {
+ final Tile suggestion = (Tile) mSuggestions.get(position);
+ final String suggestionId = mSuggestionFeatureProvider.getSuggestionIdentifier(
+ mContext, suggestion);
+ // This is for cases when a suggestion is dismissed and the next one comes to view
+ if (!mSuggestionsShownLogged.contains(suggestionId)) {
+ mMetricsFeatureProvider.action(
+ mContext, MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION, suggestionId);
+ mSuggestionsShownLogged.add(suggestionId);
+ }
+ if (suggestion.remoteViews != null) {
+ final ViewGroup itemView = (ViewGroup) holder.itemView;
+ itemView.removeAllViews();
+ itemView.addView(suggestion.remoteViews.apply(itemView.getContext(), itemView));
+ } else {
+ holder.icon.setImageDrawable(mCache.getIcon(suggestion.icon));
+ holder.title.setText(suggestion.title);
+ if (!TextUtils.isEmpty(suggestion.summary)) {
+ holder.summary.setText(suggestion.summary);
+ holder.summary.setVisibility(View.VISIBLE);
+ } else {
+ holder.summary.setVisibility(View.GONE);
+ }
+ }
+ final View divider = holder.itemView.findViewById(R.id.divider);
+ if (divider != null) {
+ divider.setVisibility(position < mSuggestions.size() - 1 ? View.VISIBLE : View.GONE);
+ }
+ View clickHandler = holder.itemView;
+ // If a view with @android:id/primary is defined, use that as the click handler
+ // instead.
+ final View primaryAction = holder.itemView.findViewById(android.R.id.primary);
+ if (primaryAction != null) {
+ clickHandler = primaryAction;
+ // set the item view to disabled to remove any touch effects
+ holder.itemView.setEnabled(false);
+ }
+ clickHandler.setOnClickListener(v -> {
+ mMetricsFeatureProvider.action(mContext,
+ MetricsEvent.ACTION_SETTINGS_SUGGESTION, suggestionId);
+ ((SettingsActivity) mContext).startSuggestion(suggestion.intent);
+ });
+ }
+
+ @Override
+ public long getItemId(int position) {
+ return Objects.hash(mSuggestions.get(position).title);
+ }
+
+ @Override
+ public int getItemViewType(int position) {
+ return layout.suggestion_tile_new_ui;
+ }
+
+ @Override
+ public int getItemCount() {
+ return mSuggestions.size();
+ }
+
+ public Tile getSuggestion(int position) {
+ final long itemId = getItemId(position);
+ for (Tile tile: mSuggestions) {
+ if (Objects.hash(tile.title) == itemId) {
+ return tile;
+ }
+ }
+ return null;
+ }
+
+}
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionDismissController.java b/src/com/android/settings/dashboard/suggestions/SuggestionDismissController.java
index 776bd1e9973..f0a65f68602 100644
--- a/src/com/android/settings/dashboard/suggestions/SuggestionDismissController.java
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionDismissController.java
@@ -67,6 +67,7 @@ public class SuggestionDismissController extends ItemTouchHelper.SimpleCallback
public int getSwipeDirs(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
final int layoutId = viewHolder.getItemViewType();
if (layoutId == R.layout.suggestion_tile
+ || layoutId == R.layout.suggestion_tile_new_ui
|| layoutId == R.layout.suggestion_tile_card) {
// Only return swipe direction for suggestion tiles. All other types are not swipeable.
return super.getSwipeDirs(recyclerView, viewHolder);
diff --git a/tests/robotests/src/com/android/settings/conditional/ConditionAdapterUtilsTest.java b/tests/robotests/src/com/android/settings/conditional/ConditionAdapterUtilsTest.java
index dde291d9489..bf28d973cbb 100644
--- a/tests/robotests/src/com/android/settings/conditional/ConditionAdapterUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/conditional/ConditionAdapterUtilsTest.java
@@ -36,6 +36,8 @@ import com.android.settings.R;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.when;
+// Not needed in new UI as the view is always expanded
+@Deprecated
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ConditionAdapterUtilsTest{
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java
index 8eae8bcd4c9..5799b2254c0 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java
@@ -163,14 +163,6 @@ public class DashboardAdapterTest {
assertThat(holder.itemView.getBackground()).isInstanceOf(ColorDrawable.class);
}
- @Test
- public void testSetConditions_AfterSetConditions_ExpandedConditionNull() {
- mDashboardAdapter.onExpandClick(mView);
- assertThat(mDashboardAdapter.mDashboardData.getExpandedCondition()).isEqualTo(mCondition);
- mDashboardAdapter.setConditions(null);
- assertThat(mDashboardAdapter.mDashboardData.getExpandedCondition()).isNull();
- }
-
@Test
public void testSuggestionsLogs_NotExpanded() {
setupSuggestions(makeSuggestions("pkg1", "pkg2", "pkg3"));
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardDataTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardDataTest.java
index 8bbb15b3ba1..23681bc0599 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardDataTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardDataTest.java
@@ -88,17 +88,21 @@ public class DashboardDataTest {
mDashboardCategory.tiles.add(mTestCategoryTile);
categories.add(mDashboardCategory);
- // Build DashboardData
+ // Build DashboardData
mDashboardDataWithOneConditions = new DashboardData.Builder()
.setConditions(oneItemConditions)
.setCategories(categories)
.setSuggestions(suggestions)
+ .setSuggestionConditionMode(DashboardData.HEADER_MODE_FULLY_EXPANDED)
+ .setCombineSuggestionAndCondition(true)
.build();
mDashboardDataWithTwoConditions = new DashboardData.Builder()
.setConditions(twoItemsConditions)
.setCategories(categories)
.setSuggestions(suggestions)
+ .setSuggestionConditionMode(DashboardData.HEADER_MODE_FULLY_EXPANDED)
+ .setCombineSuggestionAndCondition(true)
.build();
mDashboardDataWithNoItems = new DashboardData.Builder()
@@ -110,23 +114,33 @@ public class DashboardDataTest {
@Test
public void testBuildItemsData_containsAllData() {
- final DashboardData.SuggestionHeaderData data =
- new DashboardData.SuggestionHeaderData(false, 1, 0);
- final Object[] expectedObjects = {null, mTestCondition, null, data, mTestSuggestion,
- mDashboardCategory, mTestCategoryTile};
+ final DashboardData.SuggestionConditionHeaderData data =
+ new DashboardData.SuggestionConditionHeaderData(
+ mDashboardDataWithOneConditions.getConditions(), 0);
+ final Object[] expectedObjects = {null, data,
+ mDashboardDataWithOneConditions.getSuggestions(),
+ mDashboardDataWithOneConditions.getConditions(),
+ null, mDashboardCategory, mTestCategoryTile};
final int expectedSize = expectedObjects.length;
assertThat(mDashboardDataWithOneConditions.getItemList().size())
.isEqualTo(expectedSize);
for (int i = 0; i < expectedSize; i++) {
- if (mDashboardDataWithOneConditions.getItemEntityByPosition(i)
- instanceof DashboardData.SuggestionHeaderData) {
+ final Object item = mDashboardDataWithOneConditions.getItemEntityByPosition(i);
+ if (item instanceof DashboardData.SuggestionHeaderData
+ || item instanceof List) {
// SuggestionHeaderData is created inside when build, we can only use isEqualTo
- assertThat(mDashboardDataWithOneConditions.getItemEntityByPosition(i))
- .isEqualTo(expectedObjects[i]);
+ assertThat(item).isEqualTo(expectedObjects[i]);
+ } else if (item instanceof DashboardData.SuggestionConditionHeaderData) {
+ DashboardData.SuggestionConditionHeaderData i1 =
+ (DashboardData.SuggestionConditionHeaderData)item;
+ DashboardData.SuggestionConditionHeaderData i2 =
+ (DashboardData.SuggestionConditionHeaderData)expectedObjects[i];
+ assertThat(i1.title).isEqualTo(i2.title);
+ assertThat(i1.conditionCount).isEqualTo(i2.conditionCount);
+ assertThat(i1.hiddenSuggestionCount).isEqualTo(i2.hiddenSuggestionCount);
} else {
- assertThat(mDashboardDataWithOneConditions.getItemEntityByPosition(i))
- .isSameAs(expectedObjects[i]);
+ assertThat(item).isSameAs(expectedObjects[i]);
}
}
}
@@ -134,7 +148,7 @@ public class DashboardDataTest {
@Test
public void testGetPositionByEntity_selfInstance_returnPositionFound() {
final int position = mDashboardDataWithOneConditions
- .getPositionByEntity(mTestCondition);
+ .getPositionByEntity(mDashboardDataWithOneConditions.getConditions());
assertThat(position).isNotEqualTo(DashboardData.POSITION_NOT_FOUND);
}
@@ -176,11 +190,17 @@ public class DashboardDataTest {
}
@Test
- public void testDiffUtil_InsertOneCondition_ResultDataOneInserted() {
+ public void testDiffUtil_InsertOneCondition_ResultDataTwoChanged() {
//Build testResultData
final List testResultData = new ArrayList<>();
+ // Item in position 1 is the header, which contains the number of conditions, changed from
+ // 1 to 2
testResultData.add(new ListUpdateResult.ResultData(
- ListUpdateResult.ResultData.TYPE_OPERATION_INSERT, 2, 1));
+ ListUpdateResult.ResultData.TYPE_OPERATION_CHANGE, 1, 1));
+ // Item in position 3 is the condition container containing the list of conditions, which
+ // gets 1 more item
+ testResultData.add(new ListUpdateResult.ResultData(
+ ListUpdateResult.ResultData.TYPE_OPERATION_CHANGE, 3, 1));
testDiffUtil(mDashboardDataWithOneConditions,
mDashboardDataWithTwoConditions, testResultData);
@@ -196,31 +216,6 @@ public class DashboardDataTest {
testDiffUtil(mDashboardDataWithOneConditions, mDashboardDataWithNoItems, testResultData);
}
- @Test
- public void testPayload_ItemConditionCard_returnNotNull() {
- final DashboardData.ItemsDataDiffCallback callback = new DashboardData
- .ItemsDataDiffCallback(
- mDashboardDataWithOneConditions.getItemList(),
- mDashboardDataWithOneConditions.getItemList());
-
- // Item in position 1 is condition card, which payload should not be null
- assertThat(callback.getChangePayload(1, 1)).isNotNull();
- }
-
- @Test
- public void testPayload_ItemNotConditionCard_returnNull() {
- final DashboardData.ItemsDataDiffCallback callback = new DashboardData
- .ItemsDataDiffCallback(
- mDashboardDataWithOneConditions.getItemList(),
- mDashboardDataWithOneConditions.getItemList());
-
- // Position 0 is spacer, 1 is condition card, so others' payload should be null
- for (int i = 2; i < mDashboardDataWithOneConditions.getItemList().size(); i++) {
- assertThat(callback.getChangePayload(i, i)).isNull();
- }
-
- }
-
/**
* Test when using the
* {@link com.android.settings.dashboard.DashboardData.ItemsDataDiffCallback}
diff --git a/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionAdapterTest.java b/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionAdapterTest.java
new file mode 100644
index 00000000000..141ef6e91c8
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionAdapterTest.java
@@ -0,0 +1,135 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.dashboard.conditional;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.LinearLayout;
+
+import com.android.settings.R;
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.dashboard.DashboardAdapter;
+import com.android.settings.dashboard.DashboardData;
+import com.android.settings.dashboard.conditional.Condition;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class ConditionAdapterTest {
+ @Mock
+ private Condition mCondition1;
+ @Mock
+ private Condition mCondition2;
+
+ private Context mContext;
+ private ConditionAdapter mConditionAdapter;
+ private List mOneCondition;
+ private List mTwoConditions;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mContext = RuntimeEnvironment.application;
+ final CharSequence[] actions = new CharSequence[2];
+ when(mCondition1.getActions()).thenReturn(actions);
+ when(mCondition1.shouldShow()).thenReturn(true);
+ mOneCondition = new ArrayList<>();
+ mOneCondition.add(mCondition1);
+ mTwoConditions = new ArrayList<>();
+ mTwoConditions.add(mCondition1);
+ mTwoConditions.add(mCondition2);
+ }
+
+ @Test
+ public void getItemCount_notFullyExpanded_shouldReturn0() {
+ mConditionAdapter = new ConditionAdapter(
+ mContext, mOneCondition, DashboardData.HEADER_MODE_DEFAULT);
+ assertThat(mConditionAdapter.getItemCount()).isEqualTo(0);
+
+ mConditionAdapter = new ConditionAdapter(
+ mContext, mOneCondition, DashboardData.HEADER_MODE_SUGGESTION_EXPANDED);
+ assertThat(mConditionAdapter.getItemCount()).isEqualTo(0);
+
+ mConditionAdapter = new ConditionAdapter(
+ mContext, mOneCondition, DashboardData.HEADER_MODE_COLLAPSED);
+ assertThat(mConditionAdapter.getItemCount()).isEqualTo(0);
+ }
+
+ @Test
+ public void getItemCount_fullyExpanded_shouldReturnListSize() {
+ mConditionAdapter = new ConditionAdapter(
+ mContext, mOneCondition, DashboardData.HEADER_MODE_FULLY_EXPANDED);
+ assertThat(mConditionAdapter.getItemCount()).isEqualTo(1);
+
+ mConditionAdapter = new ConditionAdapter(
+ mContext, mTwoConditions, DashboardData.HEADER_MODE_FULLY_EXPANDED);
+ assertThat(mConditionAdapter.getItemCount()).isEqualTo(2);
+ }
+
+ @Test
+ public void getItemViewType_shouldReturnConditionTile() {
+ mConditionAdapter = new ConditionAdapter(
+ mContext, mTwoConditions, DashboardData.HEADER_MODE_FULLY_EXPANDED);
+ assertThat(mConditionAdapter.getItemViewType(0)).isEqualTo(R.layout.condition_tile_new_ui);
+ }
+
+ @Test
+ public void onBindViewHolder_shouldSetListener() {
+ final View view = LayoutInflater.from(mContext).inflate(
+ R.layout.condition_tile_new_ui, new LinearLayout(mContext), true);
+ final DashboardAdapter.DashboardItemHolder viewHolder =
+ new DashboardAdapter.DashboardItemHolder(view);
+ mConditionAdapter = new ConditionAdapter(
+ mContext, mOneCondition, DashboardData.HEADER_MODE_SUGGESTION_EXPANDED);
+
+ mConditionAdapter.onBindViewHolder(viewHolder, 0);
+ final View card = view.findViewById(R.id.content);
+ assertThat(card.hasOnClickListeners()).isTrue();
+ }
+
+ @Test
+ public void viewClick_shouldInvokeConditionPrimaryClick() {
+ final View view = LayoutInflater.from(mContext).inflate(
+ R.layout.condition_tile_new_ui, new LinearLayout(mContext), true);
+ final DashboardAdapter.DashboardItemHolder viewHolder =
+ new DashboardAdapter.DashboardItemHolder(view);
+ mConditionAdapter = new ConditionAdapter(
+ mContext, mOneCondition, DashboardData.HEADER_MODE_SUGGESTION_EXPANDED);
+
+ mConditionAdapter.onBindViewHolder(viewHolder, 0);
+ final View card = view.findViewById(R.id.content);
+ card.performClick();
+ verify(mCondition1).onPrimaryClick();
+ }
+
+}
diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java
new file mode 100644
index 00000000000..cf45c016755
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.dashboard.suggestions;
+
+import android.content.Context;
+import android.graphics.drawable.Icon;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.LinearLayout;
+
+import com.android.settings.R;
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.dashboard.DashboardAdapter;
+import com.android.settingslib.drawer.Tile;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class SuggestionAdapterTest {
+ @Mock
+ private Tile mSuggestion1;
+ @Mock
+ private Tile mSuggestion2;
+
+ private Context mContext;
+ private SuggestionAdapter mSuggestionAdapter;
+ private List mOneSuggestion;
+ private List mTwoSuggestions;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mContext = RuntimeEnvironment.application;
+ mSuggestion1.title = "Test Suggestion 1";
+ mSuggestion1.icon = mock(Icon.class);
+ mSuggestion2.title = "Test Suggestion 2";
+ mSuggestion2.icon = mock(Icon.class);
+ mOneSuggestion = new ArrayList<>();
+ mOneSuggestion.add(mSuggestion1);
+ mTwoSuggestions = new ArrayList<>();
+ mTwoSuggestions.add(mSuggestion1);
+ mTwoSuggestions.add(mSuggestion2);
+ }
+
+ @Test
+ public void getItemCount_shouldReturnListSize() {
+ mSuggestionAdapter = new SuggestionAdapter(mContext, mOneSuggestion, new ArrayList<>());
+ assertThat(mSuggestionAdapter.getItemCount()).isEqualTo(1);
+
+ mSuggestionAdapter = new SuggestionAdapter(mContext, mTwoSuggestions, new ArrayList<>());
+ assertThat(mSuggestionAdapter.getItemCount()).isEqualTo(2);
+ }
+
+ @Test
+ public void getItemViewType_shouldReturnSuggestionTile() {
+ mSuggestionAdapter = new SuggestionAdapter(mContext, mOneSuggestion, new ArrayList<>());
+ assertThat(mSuggestionAdapter.getItemViewType(0))
+ .isEqualTo(R.layout.suggestion_tile_new_ui);
+ }
+
+ @Test
+ public void onBindViewHolder_shouldSetListener() {
+ final View view = spy(LayoutInflater.from(mContext).inflate(
+ R.layout.suggestion_tile_new_ui, new LinearLayout(mContext), true));
+ final DashboardAdapter.DashboardItemHolder viewHolder =
+ new DashboardAdapter.DashboardItemHolder(view);
+ mSuggestionAdapter = new SuggestionAdapter(mContext, mOneSuggestion, new ArrayList<>());
+
+ mSuggestionAdapter.onBindViewHolder(viewHolder, 0);
+
+ verify(view).setOnClickListener(any(View.OnClickListener.class));
+ }
+
+}