remoting/android/java/src/org/chromium/chromoting/TouchInputHandler.java - Issue 2322623002: [Remoting Android] Refactor GlDesktopView

Unified Diff: remoting/android/java/src/org/chromium/chromoting/TouchInputHandler.java

Issue 2322623002: [Remoting Android] Refactor GlDesktopView (Closed)

Patch Set: Fix processAnimation bug. Abort animation when detach Created 4 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

« remoting/android/java/src/org/chromium/chromoting/DesktopView.java ('K') | « remoting/android/java/src/org/chromium/chromoting/InputMonitor.java ('k') | remoting/android/java/src/org/chromium/chromoting/jni/Client.java » ('j') | remoting/android/java/src/org/chromium/chromoting/jni/Client.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

diff --git a/remoting/android/java/src/org/chromium/chromoting/TouchInputHandler.java b/remoting/android/java/src/org/chromium/chromoting/TouchInputHandler.java

index 8800e568d2c5106b270b0853a6e85bc35dd8a48e..42957332039620d38f4b17720f3a2822783518d8 100644

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

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

@@ -8,11 +8,15 @@ import android.content.Context;

import android.graphics.Matrix;

import android.graphics.PointF;

import android.graphics.Rect;

+import android.util.Pair;

import android.view.GestureDetector;

import android.view.MotionEvent;

import android.view.ScaleGestureDetector;

import android.view.ViewConfiguration;

+import java.util.ArrayList;

+import java.util.List;

/**

* This class is responsible for handling Touch input from the user. Touch events which manipulate

* the local canvas are handled in this class and any input which should be sent to the remote host

@@ -21,23 +25,25 @@ import android.view.ViewConfiguration;

public class TouchInputHandler {

private static final float EPSILON = 0.001f;

+ private final List<Pair<Object, Event<?>>> mAttachedEvents = new ArrayList<>();

private final DesktopView mViewer;

private final Context mContext;

private final RenderData mRenderData;

private final DesktopCanvas mDesktopCanvas;

- private InputStrategyInterface mInputStrategy;

- private GestureDetector mScroller;

- private ScaleGestureDetector mZoomer;

- private TapGestureDetector mTapDetector;

+ private final RenderStub mRenderStub;

+ private final GestureDetector mScroller;

+ private final ScaleGestureDetector mZoomer;

+ private final TapGestureDetector mTapDetector;

/** Used to disambiguate a 2-finger gesture as a swipe or a pinch. */

- private SwipePinchDetector mSwipePinchDetector;

+ private final SwipePinchDetector mSwipePinchDetector;

// Used for processing cursor & scroller fling animations.

// May consider using a List of AnimationJob if we have more than two animation jobs in

// the future.

- private FlingAnimationJob mCursorAnimationJob, mScrollAnimationJob;

+ private final FlingAnimationJob mCursorAnimationJob, mScrollAnimationJob;

Hzj_jie 2016/09/10 02:06:32 IMO, placing two variables in a same definition li

Yuwei 2016/09/12 18:56:13 Done.

+ private InputStrategyInterface mInputStrategy;

/**

* Used for tracking swipe gestures. Only the Y-direction is needed for responding to swipe-up

@@ -180,14 +186,24 @@ public class TouchInputHandler {

}

- public TouchInputHandler(DesktopView viewer, Context context) {

+ private <ParamT> void attachEvent(Event<ParamT> event,

+ Event.ParameterRunnable<ParamT> runnable) {

+ mAttachedEvents.add(new Pair<Object, Event<?>>(event.add(runnable), event));

+ }

Hzj_jie 2016/09/10 02:06:32 Functions should be placed after constructors.

Yuwei 2016/09/12 18:56:13 Done.

+ public TouchInputHandler(DesktopView viewer, Desktop desktop, RenderStub renderStub,

+ final InputEventSender injector) {

+ Preconditions.notNull(injector);

+ Preconditions.notNull(renderStub);

mViewer = viewer;

- mContext = context;

+ mContext = desktop;

+ mRenderStub = renderStub;

mRenderData = new RenderData();

- mDesktopCanvas = new DesktopCanvas(mViewer, mRenderData);

+ mDesktopCanvas = new DesktopCanvas(renderStub, mRenderData);

GestureListener listener = new GestureListener();

- mScroller = new GestureDetector(context, listener, null, false);

+ mScroller = new GestureDetector(desktop, listener, null, false);

// If long-press is enabled, the gesture-detector will not emit any further onScroll

// notifications after the onLongPress notification. Since onScroll is being used for

@@ -195,22 +211,22 @@ public class TouchInputHandler {

// down too long.

mScroller.setIsLongpressEnabled(false);

- mZoomer = new ScaleGestureDetector(context, listener);

- mTapDetector = new TapGestureDetector(context, listener);

- mSwipePinchDetector = new SwipePinchDetector(context);

+ mZoomer = new ScaleGestureDetector(desktop, listener);

+ mTapDetector = new TapGestureDetector(desktop, listener);

+ mSwipePinchDetector = new SwipePinchDetector(desktop);

// The threshold needs to be bigger than the ScaledTouchSlop used by the gesture-detectors,

// so that a gesture cannot be both a tap and a swipe. It also needs to be small enough so

// that intentional swipes are usually detected.

- float density = context.getResources().getDisplayMetrics().density;

+ float density = desktop.getResources().getDisplayMetrics().density;

mSwipeThreshold = 40 * density;

- mEdgeSlopInPx = ViewConfiguration.get(context).getScaledEdgeSlop();

+ mEdgeSlopInPx = ViewConfiguration.get(desktop).getScaledEdgeSlop();

mInputStrategy = new NullInputStrategy();

- mCursorAnimationJob = new CursorAnimationJob(context);

- mScrollAnimationJob = new ScrollAnimationJob(context);

+ mCursorAnimationJob = new CursorAnimationJob(desktop);

+ mScrollAnimationJob = new ScrollAnimationJob(desktop);

mProcessAnimationCallback = new Event.ParameterCallback<Boolean, Void>() {

@Override

@@ -219,7 +235,55 @@ public class TouchInputHandler {

}

};

- attachViewEvents(viewer);

+ attachEvent(mViewer.onTouch(), new Event.ParameterRunnable<TouchEventParameter>() {

+ @Override

+ public void run(TouchEventParameter parameter) {

+ parameter.handled = handleTouchEvent(parameter.event);

+ }

+ });

+ attachEvent(desktop.onInputModeChanged(),

+ new Event.ParameterRunnable<InputModeChangedEventParameter>() {

+ @Override

+ public void run(InputModeChangedEventParameter parameter) {

+ handleInputModeChanged(parameter, injector);

+ }

+ });

+ attachEvent(desktop.onSystemUiVisibilityChanged(),

+ new Event.ParameterRunnable<SystemUiVisibilityChangedEventParameter>() {

+ @Override

+ public void run(SystemUiVisibilityChangedEventParameter parameter) {

+ handleSystemUiVisibilityChanged(parameter);

+ }

+ });

+ attachEvent(renderStub.onClientSizeChanged(),

+ new Event.ParameterRunnable<SizeChangedEventParameter>() {

+ @Override

+ public void run(SizeChangedEventParameter parameter) {

+ handleClientSizeChanged(parameter.width, parameter.height);

+ }

+ });

+ attachEvent(renderStub.onHostSizeChanged(),

+ new Event.ParameterRunnable<SizeChangedEventParameter>() {

+ @Override

+ public void run(SizeChangedEventParameter parameter) {

+ handleHostSizeChanged(parameter.width, parameter.height);

+ }

+ });

+ }

+ /**

+ * Detaches all registered event listeners.

+ */

+ public void detach() {

+ abortAnimation();

+ for (Pair<Object, Event<?>> pair : mAttachedEvents) {

+ pair.second.remove(pair.first);

+ }

+ mAttachedEvents.clear();

}

/**

@@ -234,7 +298,7 @@ public class TouchInputHandler {

* Start stepping animation when onCanvasRendered is triggered.

private void startAnimation() {

- mViewer.onCanvasRendered().addSelfRemovable(mProcessAnimationCallback);

+ mRenderStub.onCanvasRendered().addSelfRemovable(mProcessAnimationCallback);

}

/**

@@ -245,46 +309,6 @@ public class TouchInputHandler {

mScrollAnimationJob.abortAnimation();

}

- 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 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) {

- handleClientSizeChanged(parameter.width, parameter.height);

- }

- });

- viewer.onHostSizeChanged().add(new Event.ParameterRunnable<SizeChangedEventParameter>() {

- @Override

- public void run(SizeChangedEventParameter parameter) {

- handleHostSizeChanged(parameter.width, parameter.height);

- }

- });

- }

private void handleInputModeChanged(

InputModeChangedEventParameter parameter, InputEventSender injector) {

final Desktop.InputMode inputMode = parameter.inputMode;

@@ -316,7 +340,7 @@ public class TouchInputHandler {

}

// Ensure the cursor state is updated appropriately.

- mViewer.cursorVisibilityChanged(mRenderData.drawCursor);

+ mRenderStub.setCursorVisibility(mRenderData.drawCursor);

}

private void handleSystemUiVisibilityChanged(

@@ -437,7 +461,7 @@ public class TouchInputHandler {

mInputStrategy.injectCursorMoveEvent((int) newX, (int) newY);

}

- mViewer.cursorMoved(mRenderData.getCursorPosition());

+ mRenderStub.moveCursor(mRenderData.getCursorPosition());

}

/** Processes a (multi-finger) swipe gesture. */

@@ -616,7 +640,7 @@ public class TouchInputHandler {

if (mInputStrategy.onTap(button)) {

PointF pos = mRenderData.getCursorPosition();

- mViewer.showInputFeedback(mInputStrategy.getShortPressFeedbackType(), pos);

+ mRenderStub.showInputFeedback(mInputStrategy.getShortPressFeedbackType(), pos);

}

return true;

}

@@ -639,7 +663,7 @@ public class TouchInputHandler {

if (mInputStrategy.onPressAndHold(button)) {

PointF pos = mRenderData.getCursorPosition();

- mViewer.showInputFeedback(mInputStrategy.getLongPressFeedbackType(), pos);

+ mRenderStub.showInputFeedback(mInputStrategy.getLongPressFeedbackType(), pos);

mSuppressFling = true;

mIsDragging = true;

}