Merge "Adjust the widgets fitting algorithm to mitigate over packing issue" into sc-dev (96793bdf) · Commits · e / os / android_packages_apps_Trebuchet

robolectric_tests/src/com/android/launcher3/widget/picker/util/WidgetsTableUtilsTest.java

+20 −16

Original line number	Diff line number	Diff line
		@@ -96,12 +96,12 @@ public final class WidgetsTableUtilsTest {
		List<ArrayList<WidgetItem>> widgetItemInTable = WidgetsTableUtils.groupWidgetItemsIntoTable(
		widgetItems, /* maxSpansPerRow= */ 5);

		// Row 0: 1x1, 2x2, 2x3
		// Row 1: 2x4
		// Row 0: 1x1, 2x2
		// Row 1: 2x3, 2x4
		// Row 2: 4x4
		assertThat(widgetItemInTable).hasSize(3);
		assertThat(widgetItemInTable.get(0)).containsExactly(mWidget1x1, mWidget2x2, mWidget2x3);
		assertThat(widgetItemInTable.get(1)).containsExactly(mWidget2x4);
		assertThat(widgetItemInTable.get(0)).containsExactly(mWidget1x1, mWidget2x2);
		assertThat(widgetItemInTable.get(1)).containsExactly(mWidget2x3, mWidget2x4);
		assertThat(widgetItemInTable.get(2)).containsExactly(mWidget4x4);
		}

		@@ -114,12 +114,14 @@ public final class WidgetsTableUtilsTest {
		widgetItems, /* maxSpansPerRow= */ 4);

		// Row 0: 1x1, 2x2
		// Row 1: 2x3, 2x4
		// Row 2: 4x4
		assertThat(widgetItemInTable).hasSize(3);
		// Row 1: 2x3,
		// Row 2: 2x4,
		// Row 3: 4x4
		assertThat(widgetItemInTable).hasSize(4);
		assertThat(widgetItemInTable.get(0)).containsExactly(mWidget1x1, mWidget2x2);
		assertThat(widgetItemInTable.get(1)).containsExactly(mWidget2x3, mWidget2x4);
		assertThat(widgetItemInTable.get(2)).containsExactly(mWidget4x4);
		assertThat(widgetItemInTable.get(1)).containsExactly(mWidget2x3);
		assertThat(widgetItemInTable.get(2)).containsExactly(mWidget2x4);
		assertThat(widgetItemInTable.get(3)).containsExactly(mWidget4x4);
		}

		@Test
		@@ -131,14 +133,16 @@ public final class WidgetsTableUtilsTest {
		widgetItems, /* maxSpansPerRow= */ 4);

		// Row 0: 1x1, 2x2
		// Row 1: 2x3, 2x4
		// Row 2: 4x4
		// Row 3: shortcut3, shortcut1, shortcut2
		assertThat(widgetItemInTable).hasSize(4);
		// Row 1: 2x3,
		// Row 2: 2x4,
		// Row 3: 4x4
		// Row 4: shortcut3, shortcut1, shortcut2
		assertThat(widgetItemInTable).hasSize(5);
		assertThat(widgetItemInTable.get(0)).containsExactly(mWidget1x1, mWidget2x2);
		assertThat(widgetItemInTable.get(1)).containsExactly(mWidget2x3, mWidget2x4);
		assertThat(widgetItemInTable.get(2)).containsExactly(mWidget4x4);
		assertThat(widgetItemInTable.get(3)).containsExactly(mShortcut3, mShortcut2, mShortcut1);
		assertThat(widgetItemInTable.get(1)).containsExactly(mWidget2x3);
		assertThat(widgetItemInTable.get(2)).containsExactly(mWidget2x4);
		assertThat(widgetItemInTable.get(3)).containsExactly(mWidget4x4);
		assertThat(widgetItemInTable.get(4)).containsExactly(mShortcut3, mShortcut2, mShortcut1);
		}

		private void initTestWidgets() {

src/com/android/launcher3/widget/util/WidgetsTableUtils.java

+10 −4

Original line number	Diff line number	Diff line
		@@ -52,9 +52,10 @@ public final class WidgetsTableUtils {
		* <p>Grouping:
		* 1. Widgets and shortcuts never group together in the same row.
		* 2. The ordered widgets are grouped together in the same row until their total horizontal
		* spans exceed the {@code maxSpansPerRow}.
		* spans exceed the {@code maxSpansPerRow} - 1.
		* 3. The order shortcuts are grouped together in the same row until their total horizontal
		* spans exceed the {@code maxSpansPerRow}.
		* spans exceed the {@code maxSpansPerRow} - 1.
		* 4. If there is only one widget in a row, its width may exceed the {@code maxSpansPerRow}.
		*/
		public static List<ArrayList<WidgetItem>> groupWidgetItemsIntoTable(
		List<WidgetItem> widgetItems, final int maxSpansPerRow) {
		@@ -70,9 +71,14 @@ public final class WidgetsTableUtils {
		int numOfWidgetItems = widgetItemsAtRow.size();
		int totalHorizontalSpan = widgetItemsAtRow.stream().map(item -> item.spanX)
		.reduce(/* default= */ 0, Integer::sum);
		int totalHorizontalSpanAfterAddingWidget = widgetItem.spanX + totalHorizontalSpan;
		if (numOfWidgetItems == 0) {
		widgetItemsAtRow.add(widgetItem);
		} else if (widgetItem.spanX + totalHorizontalSpan <= maxSpansPerRow
		} else if (
		// The max spans per row is reduced by 1 to ensure we don't pack too many
		// 1xn widgets on the same row, which may reduce the space for rendering a
		// widget's description.
		totalHorizontalSpanAfterAddingWidget <= maxSpansPerRow - 1
		&& widgetItem.hasSameType(widgetItemsAtRow.get(numOfWidgetItems - 1))) {
		// Group items in the same row if
		// 1. they are with the same type, i.e. a row can only have widgets or shortcuts but