Trebuchet: new folder UI v1

This change adds a number of new UI components and animations for
folders.

Designer: Hayden Schoen

Change-Id: I255cd4664432d84aebecf7e16ace5d9948573e27

1 files changed, 9 insertions, 7 deletions

diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java
index 2ecc639f7..b3cc89896 100644
--- a/src/com/android/launcher3/CellLayout.java
+++ b/src/com/android/launcher3/CellLayout.java
@@ -482,13 +482,15 @@ public class CellLayout extends ViewGroup {
 
                 // Draw inner ring
                 d = FolderRingAnimator.sSharedInnerRingDrawable;
-                width = (int) (fra.getInnerRingSize() * getChildrenScale());
-                height = width;
-                canvas.save();
-                canvas.translate(centerX - width / 2, centerY - width / 2);
-                d.setBounds(0, 0, width, height);
-                d.draw(canvas);
-                canvas.restore();
+                if (d != null) {
+                    width = (int) (fra.getInnerRingSize() * getChildrenScale());
+                    height = width;
+                    canvas.save();
+                    canvas.translate(centerX - width / 2, centerY - width / 2);
+                    d.setBounds(0, 0, width, height);
+                    d.draw(canvas);
+                    canvas.restore();
+                }
             }
         }