[Remoting Android] Move setAnimationEnabled to TouchInputHandler

remoting/android/java/src/org/chromium/chromoting/TouchInputHandler.java

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chromoting;
 
 import android.content.Context;
 import android.graphics.Matrix;
 import android.graphics.PointF;
 import android.graphics.Rect;
@@ skipping 75 matching lines @@
      * trigger more swipe actions.
      */
     private boolean mSwipeCompleted = false;
 
     /**
      * Set to true when a 1 finger pan gesture originates with a longpress.  This means the user
      * is performing a drag operation.
      */
     private boolean mIsDragging = false;
 
+    private Object mOnCanvasRenderedListenerKey;
+
+    private Event.ParameterRunnable<Void> mProcessAnimationRunnable;
+
     /**
      * This class implements fling animation for cursor
      */
     private class CursorAnimationJob extends FlingAnimationJob {
         public CursorAnimationJob(Context context) {
             super(context);
         }
 
         @Override
         protected void processAction(float deltaX, float deltaY) {
@@ skipping 97 matching lines @@
         float density = context.getResources().getDisplayMetrics().density;
         mSwipeThreshold = 40 * density;
 
         mEdgeSlopInPx = ViewConfiguration.get(context).getScaledEdgeSlop();
 
         mInputStrategy = new NullInputStrategy();
 
         mCursorAnimationJob = new CursorAnimationJob(context);
         mScrollAnimationJob = new ScrollAnimationJob(context);
 
+        mProcessAnimationRunnable = new Event.ParameterRunnable<Void>() {

[Hzj_jie, 2016/08/29 22:20:23]

Why do not use SelfRemovableParameterRunner? It seems like
SelfRemovableParameterRunner is the designed for this scenario.

[Yuwei, 2016/08/29 23:24:25]

Agreed.

Done.

+            @Override
+            public void run(Void p) {
+                processAnimation();
+            }
+        };
+
         attachViewEvents(viewer);
     }
 
     public void processAnimation() {
         boolean active = mCursorAnimationJob.processAnimation();
         active |= mScrollAnimationJob.processAnimation();
 
         if (!active) {
-            mViewer.setAnimationEnabled(false);
+            setAnimationEnabled(false);
         }
     }
 
     public void init(Desktop desktop, final InputEventSender injector) {
         Preconditions.notNull(injector);
         desktop.onInputModeChanged().add(
                 new Event.ParameterRunnable<InputModeChangedEventParameter>() {
                     @Override
                     public void run(InputModeChangedEventParameter parameter) {
                         handleInputModeChanged(parameter, injector);
                     }
                 });
 
         desktop.onSystemUiVisibilityChanged().add(
                 new Event.ParameterRunnable<SystemUiVisibilityChangedEventParameter>() {
                     @Override
                     public void run(SystemUiVisibilityChangedEventParameter parameter) {
                         handleSystemUiVisibilityChanged(parameter);
                     }
                 });
     }
 
+    private void setAnimationEnabled(boolean enabled) {
+        if (enabled && mOnCanvasRenderedListenerKey == null) {
+            mOnCanvasRenderedListenerKey = mViewer.onCanvasRendered()
+                    .add(mProcessAnimationRunnable);
+            processAnimation();
+        } else if (!enabled && mOnCanvasRenderedListenerKey != null) {
+            mViewer.onCanvasRendered().remove(mOnCanvasRenderedListenerKey);
+            mOnCanvasRenderedListenerKey = null;

[Hzj_jie, 2016/08/29 22:20:23]

This seems a little bit strange to me. Is there any reason enabled == false but
mOnCanvasRenderedListenerKey == null?

[Yuwei, 2016/08/29 23:24:25]

I think that case would never happen. I probably had added this just for sanity.
This is obsolete and removed though.

+        }
+    }
+
     private void attachViewEvents(DesktopView viewer) {
         viewer.onTouch().add(new Event.ParameterRunnable<TouchEventParameter>() {
             @Override
             public void run(TouchEventParameter parameter) {
                 parameter.handled = handleTouchEvent(parameter.event);
             }
         });
         viewer.onClientSizeChanged().add(new Event.ParameterRunnable<SizeChangedEventParameter>() {
             @Override
             public void run(SizeChangedEventParameter parameter) {
@@ skipping 63 matching lines @@
 
         // Avoid short-circuit logic evaluation - ensure all gesture detectors see all events so
         // that they generate correct notifications.
         boolean handled = mScroller.onTouchEvent(event);
         handled |= mZoomer.onTouchEvent(event);
         handled |= mTapDetector.onTouchEvent(event);
         mSwipePinchDetector.onTouchEvent(event);
 
         switch (event.getActionMasked()) {
             case MotionEvent.ACTION_DOWN:
-                mViewer.setAnimationEnabled(false);
+                setAnimationEnabled(false);
                 mSuppressCursorMovement = false;
                 mSuppressFling = false;
                 mSwipeCompleted = false;
                 mIsDragging = false;
                 break;
 
             case MotionEvent.ACTION_POINTER_DOWN:
                 mTotalMotionY = 0;
                 break;
 
@@ skipping 174 matching lines @@
          * Called when a fling gesture is recognized.
          */
         @Override
         public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
             if (mSuppressFling) {
                 return false;
             }
 
             if (mScrollFling) {
                 mScrollAnimationJob.startAnimation(velocityX, velocityY);
-                mViewer.setAnimationEnabled(true);
+                setAnimationEnabled(true);
                 mScrollFling = false;
                 return true;
             }
 
             if (mSuppressCursorMovement) {
                 return false;
             }
 
             // If cursor movement is suppressed, fling also needs to be suppressed, as the
             // gesture-detector will still generate onFling() notifications based on movement of
             // the fingers, which would result in unwanted cursor movement.
             mCursorAnimationJob.startAnimation(velocityX, velocityY);
-            mViewer.setAnimationEnabled(true);
+            setAnimationEnabled(true);
             return true;
         }
 
         /** Called when the user is in the process of pinch-zooming. */
         @Override
         public boolean onScale(ScaleGestureDetector detector) {
             if (!mSwipePinchDetector.isPinching()) {
                 return false;
             }
 
@@ skipping 96 matching lines @@
             float[] mappedPoints = mapScreenPointToImagePoint(screenX, screenY);
 
             float imageWidth = (float) mRenderData.imageWidth + EPSILON;
             float imageHeight = (float) mRenderData.imageHeight + EPSILON;
 
             return mappedPoints[0] < -EPSILON || mappedPoints[0] > imageWidth
                     || mappedPoints[1] < -EPSILON || mappedPoints[1] > imageHeight;
         }
     }
 }