Merge "Work around build break in layoutlib." into jb-dev

Author: Jeff Brown

tools/layoutlib/bridge/src/android/animation/AnimationThread.java

@@ -84,20 +84,22 @@ public AnimationThread(RenderSessionImpl scene, String threadName,
     public void run() {
         Bridge.prepareThread();
         try {
+            /* FIXME: The ANIMATION_FRAME message no longer exists.  Instead, the
+             * animation timing loop is completely based on a Choreographer objects
+             * that schedules animation and drawing frames.  The animation handler is
+             * no longer even a handler; it is just a Runnable enqueued on the Choreographer.
             Handler_Delegate.setCallback(new IHandlerCallback() {
                 @Override
                 public void sendMessageAtTime(Handler handler, Message msg, long uptimeMillis) {
-                    if (msg.what == ValueAnimator.ANIMATION_START /*||
-                            FIXME: The ANIMATION_FRAME message no longer exists.  Instead,
-                            the animation timing loop is based on a Choreographer object
-                            that schedules animation and drawing frames.
-                            msg.what == ValueAnimator.ANIMATION_FRAME*/) {
+                    if (msg.what == ValueAnimator.ANIMATION_START ||
+                            msg.what == ValueAnimator.ANIMATION_FRAME) {
                         mQueue.add(new MessageBundle(handler, msg, uptimeMillis));
                     } else {
                         // just ignore.
                     }
                 }
             });
+            */
 
             // call out to the pre-animation work, which should start an animation or more.
             Result result = preAnimation();