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

Merge "Compare maxSpanSize for WidgetsListContentEntries when updating visible entries in widget picker." into sc-dev am: 50401e31bd

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15052492

Change-Id: Id36a1ed53de7fc45cb8f7f9fc2f295f23ca3643d
This commit is contained in:
Alina Zaidi
2021-06-26 18:13:24 +00:00
committed by Automerger Merge Worker
parent de30ace4db 50401e31bd
commit b06e92fc83
7 changed files with 197 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsDiffReporterTest.java
+25 -1
View File
@@ -58,7 +58,7 @@ import java.util.List;
@RunWith(RobolectricTestRunner.class)
public final class WidgetsDiffReporterTest {
private static final String TEST_PACKAGE_PREFIX = "com.google.test";
private static final String TEST_PACKAGE_PREFIX = "com.android.test";
private static final WidgetListBaseRowEntryComparator COMPARATOR =
new WidgetListBaseRowEntryComparator();
@@ -241,6 +241,30 @@ public final class WidgetsDiffReporterTest {
assertThat(currentList).containsExactlyElementsIn(newList);
}
@Test
public void headersContentsMix_contentMaxSpanSizeModified_shouldInvokeCorrectCallbacks() {
// GIVEN the current list has app headers [A, B, E content].
ArrayList<WidgetsListBaseEntry> currentList = new ArrayList<>(
List.of(mHeaderA, mHeaderB, mContentE));
// GIVEN the new list has max span size in "E content" modified.
List<WidgetsListBaseEntry> newList = List.of(
mHeaderA,
mHeaderB,
new WidgetsListContentEntry(
mContentE.mPkgItem,
mContentE.mTitleSectionName,
mContentE.mWidgets,
mContentE.getMaxSpanSizeInCells() + 1));
// WHEN computing the list difference.
mWidgetsDiffReporter.process(currentList, newList, COMPARATOR);
// THEN notify "E content" has been changed.
verify(mAdapter).notifyItemChanged(/* position= */ 2);
// THEN the current list contains all elements from the new list.
assertThat(currentList).containsExactlyElementsIn(newList);
}
private WidgetsListHeaderEntry createWidgetsHeaderEntry(String packageName, String appName,
int numOfWidgets) {
robolectric_tests/src/com/android/launcher3/widget/picker/model/WidgetsListContentEntryTest.java
+97 -8
View File
@@ -49,8 +49,10 @@ import java.util.Map;
@RunWith(RobolectricTestRunner.class)
public final class WidgetsListContentEntryTest {
private static final String PACKAGE_NAME = "com.google.test";
private final PackageItemInfo mPackageItemInfo = new PackageItemInfo(PACKAGE_NAME);
private static final String PACKAGE_NAME = "com.android.test";
private static final String PACKAGE_NAME_2 = "com.android.test2";
private final PackageItemInfo mPackageItemInfo1 = new PackageItemInfo(PACKAGE_NAME);
private final PackageItemInfo mPackageItemInfo2 = new PackageItemInfo(PACKAGE_NAME_2);
private final ComponentName mWidget1 = ComponentName.createRelative(PACKAGE_NAME, ".mWidget1");
private final ComponentName mWidget2 = ComponentName.createRelative(PACKAGE_NAME, ".mWidget2");
private final ComponentName mWidget3 = ComponentName.createRelative(PACKAGE_NAME, ".mWidget3");
@@ -91,7 +93,7 @@ public final class WidgetsListContentEntryTest {
WidgetItem widgetItem3 = createWidgetItem(mWidget3, /* spanX= */ 2, /* spanY= */ 3);
// WHEN creates a WidgetsListRowEntry with the unsorted widgets.
WidgetsListContentEntry widgetsListRowEntry = new WidgetsListContentEntry(mPackageItemInfo,
WidgetsListContentEntry widgetsListRowEntry = new WidgetsListContentEntry(mPackageItemInfo1,
/* titleSectionName= */ "T",
List.of(widgetItem1, widgetItem2, widgetItem3));
@@ -100,7 +102,7 @@ public final class WidgetsListContentEntryTest {
.containsExactly(widgetItem3, widgetItem1, widgetItem2)
.inOrder();
assertThat(widgetsListRowEntry.mTitleSectionName).isEqualTo("T");
assertThat(widgetsListRowEntry.mPkgItem).isEqualTo(mPackageItemInfo);
assertThat(widgetsListRowEntry.mPkgItem).isEqualTo(mPackageItemInfo1);
}
@Test
@@ -114,7 +116,7 @@ public final class WidgetsListContentEntryTest {
WidgetItem widgetItem3 = createWidgetItem(mWidget1, /* spanX= */ 2, /* spanY= */ 2);
// WHEN creates a WidgetsListRowEntry with the unsorted widgets.
WidgetsListContentEntry widgetsListRowEntry = new WidgetsListContentEntry(mPackageItemInfo,
WidgetsListContentEntry widgetsListRowEntry = new WidgetsListContentEntry(mPackageItemInfo1,
/* titleSectionName= */ "T",
List.of(widgetItem1, widgetItem2, widgetItem3));
@@ -124,7 +126,7 @@ public final class WidgetsListContentEntryTest {
.containsExactly(widgetItem2, widgetItem3, widgetItem1)
.inOrder();
assertThat(widgetsListRowEntry.mTitleSectionName).isEqualTo("T");
assertThat(widgetsListRowEntry.mPkgItem).isEqualTo(mPackageItemInfo);
assertThat(widgetsListRowEntry.mPkgItem).isEqualTo(mPackageItemInfo1);
}
@Test
@@ -140,7 +142,7 @@ public final class WidgetsListContentEntryTest {
WidgetItem widgetItem4 = createWidgetItem(mWidget3, /* spanX= */ 2, /* spanY= */ 2);
// WHEN creates a WidgetsListRowEntry with the unsorted widgets.
WidgetsListContentEntry widgetsListRowEntry = new WidgetsListContentEntry(mPackageItemInfo,
WidgetsListContentEntry widgetsListRowEntry = new WidgetsListContentEntry(mPackageItemInfo1,
/* titleSectionName= */ "T",
List.of(widgetItem1, widgetItem2, widgetItem3, widgetItem4));
@@ -151,9 +153,96 @@ public final class WidgetsListContentEntryTest {
.containsExactly(widgetItem4, widgetItem2, widgetItem1, widgetItem3)
.inOrder();
assertThat(widgetsListRowEntry.mTitleSectionName).isEqualTo("T");
assertThat(widgetsListRowEntry.mPkgItem).isEqualTo(mPackageItemInfo);
assertThat(widgetsListRowEntry.mPkgItem).isEqualTo(mPackageItemInfo1);
}
@Test
public void equals_entriesWithDifferentPackageItemInfo_returnFalse() {
WidgetItem widgetItem1 = createWidgetItem(mWidget1, /* spanX= */ 2, /* spanY= */ 3);
WidgetsListContentEntry widgetsListRowEntry1 = new WidgetsListContentEntry(
mPackageItemInfo1,
/* titleSectionName= */ "T",
List.of(widgetItem1),
/* maxSpanSizeInCells= */ 3);
WidgetsListContentEntry widgetsListRowEntry2 = new WidgetsListContentEntry(
mPackageItemInfo2,
/* titleSectionName= */ "T",
List.of(widgetItem1),
/* maxSpanSizeInCells= */ 3);
assertThat(widgetsListRowEntry1.equals(widgetsListRowEntry2)).isFalse();
}
@Test
public void equals_entriesWithDifferentTitleSectionName_returnFalse() {
WidgetItem widgetItem1 = createWidgetItem(mWidget1, /* spanX= */ 2, /* spanY= */ 3);
WidgetsListContentEntry widgetsListRowEntry1 = new WidgetsListContentEntry(
mPackageItemInfo1,
/* titleSectionName= */ "T",
List.of(widgetItem1),
/* maxSpanSizeInCells= */ 3);
WidgetsListContentEntry widgetsListRowEntry2 = new WidgetsListContentEntry(
mPackageItemInfo1,
/* titleSectionName= */ "S",
List.of(widgetItem1),
/* maxSpanSizeInCells= */ 3);
assertThat(widgetsListRowEntry1.equals(widgetsListRowEntry2)).isFalse();
}
@Test
public void equals_entriesWithDifferentWidgetsList_returnFalse() {
WidgetItem widgetItem1 = createWidgetItem(mWidget1, /* spanX= */ 2, /* spanY= */ 3);
WidgetItem widgetItem2 = createWidgetItem(mWidget2, /* spanX= */ 2, /* spanY= */ 3);
WidgetsListContentEntry widgetsListRowEntry1 = new WidgetsListContentEntry(
mPackageItemInfo1,
/* titleSectionName= */ "T",
List.of(widgetItem1),
/* maxSpanSizeInCells= */ 3);
WidgetsListContentEntry widgetsListRowEntry2 = new WidgetsListContentEntry(
mPackageItemInfo1,
/* titleSectionName= */ "T",
List.of(widgetItem2),
/* maxSpanSizeInCells= */ 3);
assertThat(widgetsListRowEntry1.equals(widgetsListRowEntry2)).isFalse();
}
@Test
public void equals_entriesWithDifferentMaxSpanSize_returnFalse() {
WidgetItem widgetItem1 = createWidgetItem(mWidget1, /* spanX= */ 2, /* spanY= */ 3);
WidgetsListContentEntry widgetsListRowEntry1 = new WidgetsListContentEntry(
mPackageItemInfo1,
/* titleSectionName= */ "T",
List.of(widgetItem1),
/* maxSpanSizeInCells= */ 3);
WidgetsListContentEntry widgetsListRowEntry2 = new WidgetsListContentEntry(
mPackageItemInfo1,
/* titleSectionName= */ "T",
List.of(widgetItem1),
/* maxSpanSizeInCells= */ 2);
assertThat(widgetsListRowEntry1.equals(widgetsListRowEntry2)).isFalse();
}
@Test
public void equals_entriesWithSameContents_returnTrue() {
WidgetItem widgetItem1 = createWidgetItem(mWidget1, /* spanX= */ 2, /* spanY= */ 3);
WidgetsListContentEntry widgetsListRowEntry1 = new WidgetsListContentEntry(
mPackageItemInfo1,
/* titleSectionName= */ "T",
List.of(widgetItem1),
/* maxSpanSizeInCells= */ 3);
WidgetsListContentEntry widgetsListRowEntry2 = new WidgetsListContentEntry(
mPackageItemInfo1,
/* titleSectionName= */ "T",
List.of(widgetItem1),
/* maxSpanSizeInCells= */ 3);
assertThat(widgetsListRowEntry1.equals(widgetsListRowEntry2)).isTrue();
}
private WidgetItem createWidgetItem(ComponentName componentName, int spanX, int spanY) {
String label = mWidgetsToLabels.get(componentName);
ShadowPackageManager packageManager = shadowOf(mContext.getPackageManager());