[Remoting Android] Refactor GlDesktopView

remoting/android/java/src/org/chromium/chromoting/DesktopView.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.text.InputType;
+import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.SurfaceView;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputConnection;
 import android.view.inputmethod.InputMethodManager;
 
-import org.chromium.chromoting.jni.Client;
-
 /**
  * The abstract class for viewing and interacting with a specific remote host. Handles logic

[joedow, 2016/09/08 18:32:47]

Change the comment here too since it is no longer abstract?

[Yuwei, 2016/09/08 23:09:14]

Done.

  * for touch input and render data.
  */
-public abstract class DesktopView extends SurfaceView {
-
-    protected final TouchInputHandler mInputHandler;
-
-    /**
-     * Subclass should trigger this event when the client view size is changed.
-     */
-    protected final Event.Raisable<SizeChangedEventParameter> mOnClientSizeChanged =
-            new Event.Raisable<>();
-
-    /**
-     * Subclass should trigger this event when the host (desktop frame) size is changed.
-     */
-    protected final Event.Raisable<SizeChangedEventParameter> mOnHostSizeChanged =
-            new Event.Raisable<>();
-
-    /**
-     * Subclass should trigger this event when a frame is rendered.
-     */
-    protected final Event.Raisable<Void> mOnCanvasRendered = new Event.Raisable<>();
-
-    /** The parent Desktop activity. */
-    private final Desktop mDesktop;
+public class DesktopView extends SurfaceView {
 
     private final Event.Raisable<TouchEventParameter> mOnTouch = new Event.Raisable<>();
 
-    public DesktopView(Desktop desktop, Client client) {
-        super(desktop);
-        Preconditions.notNull(desktop);
-        Preconditions.notNull(client);
-        mDesktop = desktop;
-        mInputHandler = new TouchInputHandler(this, desktop);
-        mInputHandler.init(desktop, new InputEventSender(client));
+    /** The parent Desktop activity. */
+    private Desktop mDesktop;
+
+    public DesktopView(Context context, AttributeSet attributeSet) {
+        super(context, attributeSet);
 
         // Give this view keyboard focus, allowing us to customize the soft keyboard's settings.
         setFocusableInTouchMode(true);
     }
 
+    public void init(Desktop desktop) {

[Yuwei, 2016/09/07 20:45:40]

Maybe we can get rid of this function by casting the context to Desktop in the
constructor?

[joedow, 2016/09/08 18:32:47]

Some good reasons to separate c'tor and init is if you have heavy
lifting/complicated logic in the init method and want to return success/failure
values, you want to do work in a base class but not in derived classes, you want
to be able to inject/alters behaviors for testing, or the objects you want to
pass in aren't available at construction time.

My assumption is that these generally don't apply so simplifying it would be
good if possible (and not hacky).

[Yuwei, 2016/09/08 19:12:16]

So maybe just keep the init function? Looks like the documentation doesn't
specify what Context should be when calling the c'tor.

[Hzj_jie, 2016/09/08 21:37:33]

If you need to use Desktop instead of Context, you need to use a secondary init
function. The input Context is a ContextWrapper of the Activity, but the
implementation may be changed later.

[Yuwei, 2016/09/08 23:09:14]

Acknowledged.

+        Preconditions.notNull(desktop);
+        mDesktop = desktop;
+    }
+
     // TODO(yuweih): move showActionBar and showKeyboard out of this abstract class.
     /** Shows the action bar. */
     public final void showActionBar() {
         mDesktop.showSystemUi();
     }
 
     /** Shows the software keyboard. */
     public final void showKeyboard() {
         InputMethodManager inputManager =
                 (InputMethodManager) getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
         inputManager.showSoftInput(this, 0);
     }
 
     /** An {@link Event} which is triggered when user touches the screen. */
     public final Event<TouchEventParameter> onTouch() {
         return mOnTouch;
     }
 
-    /** An {@link Event} which is triggered when the client size is changed. */
-    public final Event<SizeChangedEventParameter> onClientSizeChanged() {
-        return mOnClientSizeChanged;
-    }
-
-    /** An {@link Event} which is triggered when the host size is changed. */
-    public final Event<SizeChangedEventParameter> onHostSizeChanged() {
-        return mOnHostSizeChanged;
-    }
-
-    /** An {@link Event} which is triggered when a frame is rendered. */
-    public final Event<Void> onCanvasRendered() {
-        return mOnCanvasRendered;
-    }
-
-    // View overrides.
     /** Called when a software keyboard is requested, and specifies its options. */
     @Override
     public final InputConnection onCreateInputConnection(EditorInfo outAttrs) {
         // Disables rich input support and instead requests simple key events.
         outAttrs.inputType = InputType.TYPE_NULL;
 
         // Prevents most third-party IMEs from ignoring our Activity's adjustResize preference.
         outAttrs.imeOptions |= EditorInfo.IME_FLAG_NO_FULLSCREEN;
 
         // Ensures that keyboards will not decide to hide the remote desktop on small displays.
         outAttrs.imeOptions |= EditorInfo.IME_FLAG_NO_EXTRACT_UI;
 
         // Stops software keyboards from closing as soon as the enter key is pressed.
         outAttrs.imeOptions |= EditorInfo.IME_MASK_ACTION | EditorInfo.IME_FLAG_NO_ENTER_ACTION;
 
         return null;
     }
 
     /** Called whenever the user attempts to touch the canvas. */
     @Override
     public final boolean onTouchEvent(MotionEvent event) {
         TouchEventParameter parameter = new TouchEventParameter(event);
         mOnTouch.raise(parameter);
         return parameter.handled;
     }
-
-    /** Triggers a brief animation to indicate the existence and location of an input event. */
-    public abstract void showInputFeedback(RenderStub.InputFeedbackType feedbackToShow, PointF pos);
-
-    /**
-     * Informs the view that its transformation matrix (for rendering the remote desktop bitmap)
-     * has been changed by the TouchInputHandler, which requires repainting.
-     */
-    public abstract void transformationChanged(Matrix matrix);
-
-    /**
-     * Informs the view that the cursor has been moved by the TouchInputHandler, which requires
-     * repainting.
-     */
-    public abstract void cursorMoved(PointF position);
-
-    /**
-     * Informs the view that the cursor visibility has been changed (for different input mode) by
-     * the TouchInputHandler, which requires repainting.
-     */
-    public abstract void cursorVisibilityChanged(boolean visible);
 }