| commit | 55b8f426de3f91d23571d210648405872344a77d | [log] [tgz] |
|---|---|---|
| author | Samuel Fufa <sfufa@google.com> | Tue Mar 09 23:23:44 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 09 23:23:44 2021 +0000 |
| tree | fdd8a98a700c354ab17f734b683f6a0f8ffcedbd | |
| parent | eac1adb4f13347212b9862f46865f3ce4bf56d46 [diff] | |
| parent | dc016f37a29b42fe3b825acde0529a2e39471a18 [diff] |
Fix QSB tap crash am: dc016f37a2 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/13817052 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia9fde39b0122eabb9231d570727431e46733aebc
diff --git a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java index a05e036..bb175ea 100644 --- a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java +++ b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
@@ -290,8 +290,10 @@ public void setAppsPerRow(int appsPerRow) { mAppsPerRow = appsPerRow; int totalSpans = mAppsPerRow; - for (int itemPerRow : mSearchAdapterProvider.getSupportedItemsPerRow()) { - totalSpans *= itemPerRow; + for (int itemPerRow : mSearchAdapterProvider.getSupportedItemsPerRowArray()) { + if (totalSpans % itemPerRow != 0) { + totalSpans *= itemPerRow; + } } mGridLayoutMgr.setSpanCount(totalSpans); }
diff --git a/src/com/android/launcher3/allapps/search/SearchAdapterProvider.java b/src/com/android/launcher3/allapps/search/SearchAdapterProvider.java index 6d491fd..fdacd3d 100644 --- a/src/com/android/launcher3/allapps/search/SearchAdapterProvider.java +++ b/src/com/android/launcher3/allapps/search/SearchAdapterProvider.java
@@ -53,7 +53,7 @@ /** * Returns supported item per row combinations supported */ - public int[] getSupportedItemsPerRow() { + public int[] getSupportedItemsPerRowArray() { return new int[]{}; }