diff options
| author | Tony Wickham <twickham@google.com> | 2015-12-18 14:10:34 -0800 |
|---|---|---|
| committer | Tony Wickham <twickham@google.com> | 2015-12-18 14:10:34 -0800 |
| commit | aff1a1df8a09ff89f762c5d9915597219c022dae (patch) | |
| tree | 96795f18c718ac68e3990d2e27edba5a1ed5698b | |
| parent | 13f682f74ec46bd07358d51a52e064fd6221f0fb (diff) | |
| parent | ca656e3c69266234486c6669fc63244330cb0549 (diff) | |
| download | android_packages_apps_Trebuchet-aff1a1df8a09ff89f762c5d9915597219c022dae.tar.gz android_packages_apps_Trebuchet-aff1a1df8a09ff89f762c5d9915597219c022dae.tar.bz2 android_packages_apps_Trebuchet-aff1a1df8a09ff89f762c5d9915597219c022dae.zip | |
resolve merge conflicts of ca656e3c69 to ub-launcher3-master.
Change-Id: Idbbf8caa041b2498b3a0a9d1a8f23bf163181972
| -rw-r--r-- | src/com/android/launcher3/Folder.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java index f71b8c006..abb9f3d92 100644 --- a/src/com/android/launcher3/Folder.java +++ b/src/com/android/launcher3/Folder.java @@ -1144,7 +1144,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList Runnable onCompleteRunnable = new Runnable() { @Override public void run() { - int itemCount = getItemCount(); + int itemCount = mInfo.contents.size(); if (itemCount <= 1) { View newIcon = null; |