commit aff1a1df8a09ff89f762c5d9915597219c022dae
author Tony Wickham <twickham@google.com> Fri Dec 18 14:10:34 2015 -0800
committer Tony Wickham <twickham@google.com> Fri Dec 18 14:10:34 2015 -0800
tree 96795f18c718ac68e3990d2e27edba5a1ed5698b
parent 13f682f74ec46bd07358d51a52e064fd6221f0fb
parent ca656e3c69266234486c6669fc63244330cb0549

resolve merge conflicts of ca656e3c69 to ub-launcher3-master.

Change-Id: Idbbf8caa041b2498b3a0a9d1a8f23bf163181972

src/com/android/launcher3/Folder.java

diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java
index f71b8c0..abb9f3d 100644
--- a/src/com/android/launcher3/Folder.java
+++ b/src/com/android/launcher3/Folder.java
@@ -1144,7 +1144,7 @@
         Runnable onCompleteRunnable = new Runnable() {
             @Override
             public void run() {
-                int itemCount = getItemCount();
+                int itemCount = mInfo.contents.size();
                 if (itemCount <= 1) {
                     View newIcon = null;