Restrict the number of contextual cards shown in suggestion area.
In order to make static IA visible in the homepage, we have to limit the number of cards. Bug: 118691898 Test: robotest Change-Id: Iefb8b7e874ec1334e93be2d196b7cb72624b17b0
This commit is contained in:
@@ -20,6 +20,4 @@
|
|||||||
android:id="@+id/divider"
|
android:id="@+id/divider"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="@dimen/horizontal_divider_height"
|
android:layout_height="@dimen/horizontal_divider_height"
|
||||||
android:layout_marginTop="@dimen/horizontal_divider_margin_top"
|
|
||||||
android:layout_marginBottom="@dimen/horizontal_divider_margin_bottom"
|
|
||||||
android:background="?android:attr/dividerHorizontal"/>
|
android:background="?android:attr/dividerHorizontal"/>
|
@@ -27,5 +27,4 @@
|
|||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:layoutAnimation="@anim/layout_animation_fall_down"/>
|
android:layoutAnimation="@anim/layout_animation_fall_down"/>
|
||||||
|
|
||||||
<include layout="@layout/horizontal_divider"/>
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
@@ -33,6 +33,8 @@ import androidx.annotation.VisibleForTesting;
|
|||||||
import androidx.slice.Slice;
|
import androidx.slice.Slice;
|
||||||
|
|
||||||
import com.android.settings.homepage.contextualcards.deviceinfo.BatterySlice;
|
import com.android.settings.homepage.contextualcards.deviceinfo.BatterySlice;
|
||||||
|
import com.android.settings.homepage.contextualcards.slices.ConnectedDeviceSlice;
|
||||||
|
import com.android.settings.wifi.WifiSlice;
|
||||||
import com.android.settingslib.utils.AsyncLoaderCompat;
|
import com.android.settingslib.utils.AsyncLoaderCompat;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
@@ -40,9 +42,13 @@ import java.util.List;
|
|||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
public class ContextualCardLoader extends AsyncLoaderCompat<List<ContextualCard>> {
|
public class ContextualCardLoader extends AsyncLoaderCompat<List<ContextualCard>> {
|
||||||
private static final String TAG = "ContextualCardLoader";
|
|
||||||
|
@VisibleForTesting
|
||||||
|
static final int DEFAULT_CARD_COUNT = 4;
|
||||||
static final int CARD_CONTENT_LOADER_ID = 1;
|
static final int CARD_CONTENT_LOADER_ID = 1;
|
||||||
|
|
||||||
|
private static final String TAG = "ContextualCardLoader";
|
||||||
|
|
||||||
private Context mContext;
|
private Context mContext;
|
||||||
|
|
||||||
public interface CardContentLoaderListener {
|
public interface CardContentLoaderListener {
|
||||||
@@ -77,7 +83,30 @@ public class ContextualCardLoader extends AsyncLoaderCompat<List<ContextualCard>
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return filterEligibleCards(result);
|
return getFinalDisplayableCards(result);
|
||||||
|
}
|
||||||
|
|
||||||
|
@VisibleForTesting
|
||||||
|
List<ContextualCard> getFinalDisplayableCards(List<ContextualCard> candidates) {
|
||||||
|
List<ContextualCard> eligibleCards = filterEligibleCards(candidates);
|
||||||
|
eligibleCards = eligibleCards.stream().limit(DEFAULT_CARD_COUNT).collect(
|
||||||
|
Collectors.toList());
|
||||||
|
|
||||||
|
if (eligibleCards.size() <= 2 || getNumberOfLargeCard(eligibleCards) == 0) {
|
||||||
|
return eligibleCards;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (eligibleCards.size() == DEFAULT_CARD_COUNT) {
|
||||||
|
eligibleCards.remove(eligibleCards.size() - 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (getNumberOfLargeCard(eligibleCards) == 1) {
|
||||||
|
return eligibleCards;
|
||||||
|
}
|
||||||
|
|
||||||
|
eligibleCards.remove(eligibleCards.size() - 1);
|
||||||
|
|
||||||
|
return eligibleCards;
|
||||||
}
|
}
|
||||||
|
|
||||||
@VisibleForTesting
|
@VisibleForTesting
|
||||||
@@ -139,6 +168,13 @@ public class ContextualCardLoader extends AsyncLoaderCompat<List<ContextualCard>
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private int getNumberOfLargeCard(List<ContextualCard> cards) {
|
||||||
|
return (int) cards.stream()
|
||||||
|
.filter(card -> card.getSliceUri().equals(WifiSlice.WIFI_URI)
|
||||||
|
|| card.getSliceUri().equals(ConnectedDeviceSlice.CONNECTED_DEVICE_URI))
|
||||||
|
.count();
|
||||||
|
}
|
||||||
|
|
||||||
private long getAppVersionCode() {
|
private long getAppVersionCode() {
|
||||||
try {
|
try {
|
||||||
return mContext.getPackageManager().getPackageInfo(mContext.getPackageName(),
|
return mContext.getPackageManager().getPackageInfo(mContext.getPackageName(),
|
||||||
|
@@ -16,21 +16,31 @@
|
|||||||
|
|
||||||
package com.android.settings.homepage.contextualcards;
|
package com.android.settings.homepage.contextualcards;
|
||||||
|
|
||||||
|
import static com.android.settings.homepage.contextualcards.ContextualCardLoader.DEFAULT_CARD_COUNT;
|
||||||
|
|
||||||
import static com.google.common.truth.Truth.assertThat;
|
import static com.google.common.truth.Truth.assertThat;
|
||||||
|
|
||||||
|
import static org.mockito.ArgumentMatchers.any;
|
||||||
|
import static org.mockito.Mockito.doReturn;
|
||||||
|
import static org.mockito.Mockito.spy;
|
||||||
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.net.Uri;
|
import android.net.Uri;
|
||||||
|
|
||||||
import com.android.settings.homepage.contextualcards.deviceinfo.BatterySlice;
|
import com.android.settings.homepage.contextualcards.deviceinfo.BatterySlice;
|
||||||
|
import com.android.settings.homepage.contextualcards.slices.ConnectedDeviceSlice;
|
||||||
import com.android.settings.slices.SettingsSliceProvider;
|
import com.android.settings.slices.SettingsSliceProvider;
|
||||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||||
|
import com.android.settings.wifi.WifiSlice;
|
||||||
|
|
||||||
import org.junit.Before;
|
import org.junit.Before;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.junit.runner.RunWith;
|
import org.junit.runner.RunWith;
|
||||||
import org.robolectric.RuntimeEnvironment;
|
import org.robolectric.RuntimeEnvironment;
|
||||||
import org.robolectric.shadows.ShadowContentResolver;
|
import org.robolectric.shadows.ShadowContentResolver;
|
||||||
|
import org.robolectric.shadows.ShadowLog;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
@@ -45,7 +55,7 @@ public class ContextualCardLoaderTest {
|
|||||||
@Before
|
@Before
|
||||||
public void setUp() {
|
public void setUp() {
|
||||||
mContext = RuntimeEnvironment.application;
|
mContext = RuntimeEnvironment.application;
|
||||||
mContextualCardLoader = new ContextualCardLoader(mContext);
|
mContextualCardLoader = spy(new ContextualCardLoader(mContext));
|
||||||
mProvider = new SettingsSliceProvider();
|
mProvider = new SettingsSliceProvider();
|
||||||
ShadowContentResolver.registerProviderInternal(SettingsSliceProvider.SLICE_AUTHORITY,
|
ShadowContentResolver.registerProviderInternal(SettingsSliceProvider.SLICE_AUTHORITY,
|
||||||
mProvider);
|
mProvider);
|
||||||
@@ -92,6 +102,57 @@ public class ContextualCardLoaderTest {
|
|||||||
getContextualCard(sliceUri))).isFalse();
|
getContextualCard(sliceUri))).isFalse();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void getFinalDisplayableCards_twoEligibleCards_shouldShowAll() {
|
||||||
|
final List<ContextualCard> cards = getContextualCardList().stream().limit(2)
|
||||||
|
.collect(Collectors.toList());
|
||||||
|
doReturn(cards).when(mContextualCardLoader).filterEligibleCards(any(List.class));
|
||||||
|
|
||||||
|
final List<ContextualCard> result = mContextualCardLoader.getFinalDisplayableCards(cards);
|
||||||
|
|
||||||
|
assertThat(result).hasSize(cards.size());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void getFinalDisplayableCards_fiveEligibleCardsNoLarge_shouldShowDefaultCardCount() {
|
||||||
|
final List<ContextualCard> fiveCards = getContextualCardListWithNoLargeCard();
|
||||||
|
doReturn(fiveCards).when(mContextualCardLoader).filterEligibleCards(any(List.class));
|
||||||
|
|
||||||
|
final List<ContextualCard> result = mContextualCardLoader.getFinalDisplayableCards(
|
||||||
|
fiveCards);
|
||||||
|
|
||||||
|
assertThat(result).hasSize(DEFAULT_CARD_COUNT);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void getFinalDisplayableCards_threeEligibleCardsOneLarge_shouldShowThreeCards() {
|
||||||
|
final List<ContextualCard> cards = getContextualCardList().stream().limit(2)
|
||||||
|
.collect(Collectors.toList());
|
||||||
|
cards.add(new ContextualCard.Builder()
|
||||||
|
.setName("test_gesture")
|
||||||
|
.setCardType(ContextualCard.CardType.SLICE)
|
||||||
|
.setSliceUri(Uri.parse(
|
||||||
|
"content://com.android.settings.test.slices/action/gesture_pick_up"))
|
||||||
|
.build());
|
||||||
|
doReturn(cards).when(mContextualCardLoader).filterEligibleCards(any(List.class));
|
||||||
|
|
||||||
|
final List<ContextualCard> result = mContextualCardLoader.getFinalDisplayableCards(cards);
|
||||||
|
|
||||||
|
assertThat(result).hasSize(3);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void getFinalDisplayableCards_threeEligibleCardsTwoLarge_shouldShowTwoCards() {
|
||||||
|
final List<ContextualCard> threeCards = getContextualCardList().stream().limit(3)
|
||||||
|
.collect(Collectors.toList());
|
||||||
|
doReturn(threeCards).when(mContextualCardLoader).filterEligibleCards(any(List.class));
|
||||||
|
|
||||||
|
final List<ContextualCard> result = mContextualCardLoader.getFinalDisplayableCards(
|
||||||
|
threeCards);
|
||||||
|
|
||||||
|
assertThat(result).hasSize(2);
|
||||||
|
}
|
||||||
|
|
||||||
private ContextualCard getContextualCard(String sliceUri) {
|
private ContextualCard getContextualCard(String sliceUri) {
|
||||||
return new ContextualCard.Builder()
|
return new ContextualCard.Builder()
|
||||||
.setName("test_card")
|
.setName("test_card")
|
||||||
@@ -99,4 +160,69 @@ public class ContextualCardLoaderTest {
|
|||||||
.setSliceUri(Uri.parse(sliceUri))
|
.setSliceUri(Uri.parse(sliceUri))
|
||||||
.build();
|
.build();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private List<ContextualCard> getContextualCardList() {
|
||||||
|
final List<ContextualCard> cards = new ArrayList<>();
|
||||||
|
cards.add(new ContextualCard.Builder()
|
||||||
|
.setName("test_wifi")
|
||||||
|
.setCardType(ContextualCard.CardType.SLICE)
|
||||||
|
.setSliceUri(WifiSlice.WIFI_URI)
|
||||||
|
.build());
|
||||||
|
cards.add(new ContextualCard.Builder()
|
||||||
|
.setName("test_flashlight")
|
||||||
|
.setCardType(ContextualCard.CardType.SLICE)
|
||||||
|
.setSliceUri(
|
||||||
|
Uri.parse("content://com.android.settings.test.slices/action/flashlight"))
|
||||||
|
.build());
|
||||||
|
cards.add(new ContextualCard.Builder()
|
||||||
|
.setName("test_connected")
|
||||||
|
.setCardType(ContextualCard.CardType.SLICE)
|
||||||
|
.setSliceUri(ConnectedDeviceSlice.CONNECTED_DEVICE_URI)
|
||||||
|
.build());
|
||||||
|
cards.add(new ContextualCard.Builder()
|
||||||
|
.setName("test_gesture")
|
||||||
|
.setCardType(ContextualCard.CardType.SLICE)
|
||||||
|
.setSliceUri(Uri.parse(
|
||||||
|
"content://com.android.settings.test.slices/action/gesture_pick_up"))
|
||||||
|
.build());
|
||||||
|
cards.add(new ContextualCard.Builder()
|
||||||
|
.setName("test_battery")
|
||||||
|
.setCardType(ContextualCard.CardType.SLICE)
|
||||||
|
.setSliceUri(BatterySlice.BATTERY_CARD_URI)
|
||||||
|
.build());
|
||||||
|
return cards;
|
||||||
|
}
|
||||||
|
|
||||||
|
private List<ContextualCard> getContextualCardListWithNoLargeCard() {
|
||||||
|
final List<ContextualCard> cards = new ArrayList<>();
|
||||||
|
cards.add(new ContextualCard.Builder()
|
||||||
|
.setName("test_rotate")
|
||||||
|
.setCardType(ContextualCard.CardType.SLICE)
|
||||||
|
.setSliceUri(
|
||||||
|
Uri.parse("content://com.android.settings.test.slices/action/auto_rotate"))
|
||||||
|
.build());
|
||||||
|
cards.add(new ContextualCard.Builder()
|
||||||
|
.setName("test_flashlight")
|
||||||
|
.setCardType(ContextualCard.CardType.SLICE)
|
||||||
|
.setSliceUri(
|
||||||
|
Uri.parse("content://com.android.settings.test.slices/action/flashlight"))
|
||||||
|
.build());
|
||||||
|
cards.add(new ContextualCard.Builder()
|
||||||
|
.setName("test_bt")
|
||||||
|
.setCardType(ContextualCard.CardType.SLICE)
|
||||||
|
.setSliceUri(Uri.parse("content://android.settings.test.slices/action/bluetooth"))
|
||||||
|
.build());
|
||||||
|
cards.add(new ContextualCard.Builder()
|
||||||
|
.setName("test_gesture")
|
||||||
|
.setCardType(ContextualCard.CardType.SLICE)
|
||||||
|
.setSliceUri(Uri.parse(
|
||||||
|
"content://com.android.settings.test.slices/action/gesture_pick_up"))
|
||||||
|
.build());
|
||||||
|
cards.add(new ContextualCard.Builder()
|
||||||
|
.setName("test_battery")
|
||||||
|
.setCardType(ContextualCard.CardType.SLICE)
|
||||||
|
.setSliceUri(BatterySlice.BATTERY_CARD_URI)
|
||||||
|
.build());
|
||||||
|
return cards;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user