openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Adjust the widgets fitting algorithm to mitigate over packing issue" into sc-dev am: 96793bdfe1 

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

Change-Id: I20ed31a66c4fe1aed11dee6ad7ebb4db4422c9b7
This commit is contained in:
TreeHugger Robot 2021-05-26 21:28:50 +00:00 committed by Automerger Merge Worker
parent e8eccdb81c 96793bdfe1
commit be401a7cdb
2 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -96,12 +96,12 @@ public final class WidgetsTableUtilsTest {
List<ArrayList<WidgetItem>> widgetItemInTable = WidgetsTableUtils.groupWidgetItemsIntoTable( List<ArrayList<WidgetItem>> widgetItemInTable = WidgetsTableUtils.groupWidgetItemsIntoTable(
widgetItems, /* maxSpansPerRow= */ 5); widgetItems, /* maxSpansPerRow= */ 5);
// Row 0: 1x1, 2x2, 2x3 // Row 0: 1x1, 2x2
// Row 1: 2x4 // Row 1: 2x3, 2x4
// Row 2: 4x4 // Row 2: 4x4
assertThat(widgetItemInTable).hasSize(3); assertThat(widgetItemInTable).hasSize(3);
assertThat(widgetItemInTable.get(0)).containsExactly(mWidget1x1, mWidget2x2, mWidget2x3); assertThat(widgetItemInTable.get(0)).containsExactly(mWidget1x1, mWidget2x2);
assertThat(widgetItemInTable.get(1)).containsExactly(mWidget2x4); assertThat(widgetItemInTable.get(1)).containsExactly(mWidget2x3, mWidget2x4);
assertThat(widgetItemInTable.get(2)).containsExactly(mWidget4x4); assertThat(widgetItemInTable.get(2)).containsExactly(mWidget4x4);
} }
@ -114,12 +114,14 @@ public final class WidgetsTableUtilsTest {
widgetItems, /* maxSpansPerRow= */ 4); widgetItems, /* maxSpansPerRow= */ 4);
// Row 0: 1x1, 2x2 // Row 0: 1x1, 2x2
// Row 1: 2x3, 2x4 // Row 1: 2x3,
// Row 2: 4x4 // Row 2: 2x4,
assertThat(widgetItemInTable).hasSize(3); // Row 3: 4x4
assertThat(widgetItemInTable).hasSize(4);
assertThat(widgetItemInTable.get(0)).containsExactly(mWidget1x1, mWidget2x2); assertThat(widgetItemInTable.get(0)).containsExactly(mWidget1x1, mWidget2x2);
assertThat(widgetItemInTable.get(1)).containsExactly(mWidget2x3, mWidget2x4); assertThat(widgetItemInTable.get(1)).containsExactly(mWidget2x3);
assertThat(widgetItemInTable.get(2)).containsExactly(mWidget4x4); assertThat(widgetItemInTable.get(2)).containsExactly(mWidget2x4);
assertThat(widgetItemInTable.get(3)).containsExactly(mWidget4x4);
} }
@Test @Test
@ -131,14 +133,16 @@ public final class WidgetsTableUtilsTest {
widgetItems, /* maxSpansPerRow= */ 4); widgetItems, /* maxSpansPerRow= */ 4);
// Row 0: 1x1, 2x2 // Row 0: 1x1, 2x2
// Row 1: 2x3, 2x4 // Row 1: 2x3,
// Row 2: 4x4 // Row 2: 2x4,
// Row 3: shortcut3, shortcut1, shortcut2 // Row 3: 4x4
assertThat(widgetItemInTable).hasSize(4); // Row 4: shortcut3, shortcut1, shortcut2
assertThat(widgetItemInTable).hasSize(5);
assertThat(widgetItemInTable.get(0)).containsExactly(mWidget1x1, mWidget2x2); assertThat(widgetItemInTable.get(0)).containsExactly(mWidget1x1, mWidget2x2);
assertThat(widgetItemInTable.get(1)).containsExactly(mWidget2x3, mWidget2x4); assertThat(widgetItemInTable.get(1)).containsExactly(mWidget2x3);
assertThat(widgetItemInTable.get(2)).containsExactly(mWidget4x4); assertThat(widgetItemInTable.get(2)).containsExactly(mWidget2x4);
assertThat(widgetItemInTable.get(3)).containsExactly(mShortcut3, mShortcut2, mShortcut1); assertThat(widgetItemInTable.get(3)).containsExactly(mWidget4x4);
assertThat(widgetItemInTable.get(4)).containsExactly(mShortcut3, mShortcut2, mShortcut1);
} }
private void initTestWidgets() { private void initTestWidgets() {

12
src/com/android/launcher3/widget/util/WidgetsTableUtils.java
View File

@ -52,9 +52,10 @@ public final class WidgetsTableUtils {
* <p>Grouping: * <p>Grouping:
* 1. Widgets and shortcuts never group together in the same row. * 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 * 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 * 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( public static List<ArrayList<WidgetItem>> groupWidgetItemsIntoTable(
List<WidgetItem> widgetItems, final int maxSpansPerRow) { List<WidgetItem> widgetItems, final int maxSpansPerRow) {
@ -70,9 +71,14 @@ public final class WidgetsTableUtils {
int numOfWidgetItems = widgetItemsAtRow.size(); int numOfWidgetItems = widgetItemsAtRow.size();
int totalHorizontalSpan = widgetItemsAtRow.stream().map(item -> item.spanX) int totalHorizontalSpan = widgetItemsAtRow.stream().map(item -> item.spanX)
.reduce(/* default= */ 0, Integer::sum); .reduce(/* default= */ 0, Integer::sum);
int totalHorizontalSpanAfterAddingWidget = widgetItem.spanX + totalHorizontalSpan;
if (numOfWidgetItems == 0) { if (numOfWidgetItems == 0) {
widgetItemsAtRow.add(widgetItem); 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))) { && widgetItem.hasSameType(widgetItemsAtRow.get(numOfWidgetItems - 1))) {
// Group items in the same row if // 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 // 1. they are with the same type, i.e. a row can only have widgets or shortcuts but