diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2015-09-10 16:34:09 -0700 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2015-09-10 17:22:17 -0700 |
| commit | ea9ad5cead9ad894fb670476bb5381198cdcf2de (patch) | |
| tree | fcf23a25aadc660bd2dbb8b5178da454e8a00f08 /src/com/android/launcher3/widget/WidgetsListAdapter.java | |
| parent | 5845d3dbea53d513466c98b301eb49e96fe5d6a3 (diff) | |
| parent | 4abaf133546b0c950edc82594985e9da50d9c1dd (diff) | |
| download | android_packages_apps_Trebuchet-ea9ad5cead9ad894fb670476bb5381198cdcf2de.tar.gz android_packages_apps_Trebuchet-ea9ad5cead9ad894fb670476bb5381198cdcf2de.tar.bz2 android_packages_apps_Trebuchet-ea9ad5cead9ad894fb670476bb5381198cdcf2de.zip | |
Merge remote-tracking branch 'origin/ub-launcher3-burnaby' into mnc-dev
Conflicts:
Android.mk
Change-Id: I05429e418a25b94e7669e002d39bc70806396b8e
Diffstat (limited to 'src/com/android/launcher3/widget/WidgetsListAdapter.java')
| -rw-r--r-- | src/com/android/launcher3/widget/WidgetsListAdapter.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/launcher3/widget/WidgetsListAdapter.java b/src/com/android/launcher3/widget/WidgetsListAdapter.java index d2ea25230..f1cde299d 100644 --- a/src/com/android/launcher3/widget/WidgetsListAdapter.java +++ b/src/com/android/launcher3/widget/WidgetsListAdapter.java @@ -87,6 +87,9 @@ public class WidgetsListAdapter extends Adapter<WidgetsRowViewHolder> { @Override public int getItemCount() { + if (mWidgetsModel == null) { + return 0; + } return mWidgetsModel.getPackageSize(); } @@ -166,7 +169,7 @@ public class WidgetsListAdapter extends Adapter<WidgetsRowViewHolder> { // if the end padding is 0, then container view (horizontal scroll view) doesn't respect // the end of the linear layout width + the start padding and doesn't allow scrolling. - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) { + if (Utilities.ATLEAST_JB_MR1) { cellList.setPaddingRelative(mIndent, 0, 1, 0); } else { cellList.setPadding(mIndent, 0, 1, 0); |