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

Change-Id: Idbbf8caa041b2498b3a0a9d1a8f23bf163181972
2015-12-18 14:10:34 -08:00
parent 13f682f74e ca656e3c69
commit aff1a1df8a
1 changed files with 1 additions and 1 deletions
@@ -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;