| commit | e2fe03041e744310bbff40c21004b07dbf96d073 | [log] [tgz] |
|---|---|---|
| author | Chuck Liao <chuckliao@google.com> | Mon Jun 29 21:15:35 2020 +0800 |
| committer | Chuck Liao <chuckliao@google.com> | Tue Jun 30 11:50:57 2020 +0800 |
| tree | 08a23cfe73c64ea5b25b4d6cb660dc48a54b0ea4 | |
| parent | 6add810732f858da80f7da64f1dbc83ed3a1c7c7 [diff] |
The fallback number of columns in the grid should be 1 instead of 0. The span count passed to GridLayoutManager should at least 1. Bug: 159958634 Change-Id: I00c02fc0677e2b3c138f433f82e7369c8008d3f2
diff --git a/src/com/android/wallpaper/picker/CategorySelectorFragment.java b/src/com/android/wallpaper/picker/CategorySelectorFragment.java index 8d8d82a..98e739b 100644 --- a/src/com/android/wallpaper/picker/CategorySelectorFragment.java +++ b/src/com/android/wallpaper/picker/CategorySelectorFragment.java
@@ -194,7 +194,7 @@ private int getNumColumns() { Activity activity = getActivity(); - return activity == null ? 0 : SizeCalculator.getNumCategoryColumns(activity); + return activity == null ? 1 : SizeCalculator.getNumCategoryColumns(activity); }
diff --git a/src/com/android/wallpaper/picker/individual/IndividualPickerFragment.java b/src/com/android/wallpaper/picker/individual/IndividualPickerFragment.java index 80136a1..f4809ce 100755 --- a/src/com/android/wallpaper/picker/individual/IndividualPickerFragment.java +++ b/src/com/android/wallpaper/picker/individual/IndividualPickerFragment.java
@@ -800,7 +800,7 @@ int getNumColumns() { Activity activity = getActivity(); - return activity == null ? 0 : SizeCalculator.getNumIndividualColumns(activity); + return activity == null ? 1 : SizeCalculator.getNumIndividualColumns(activity); } /**