[Remoting Android] Placeholder for DesktopView

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.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.Point;
 import android.os.Looper;
 import android.os.SystemClock;
 import android.text.InputType;
-import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.SurfaceHolder;
-import android.view.SurfaceView;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputConnection;
 import android.view.inputmethod.InputMethodManager;
 
 import org.chromium.base.Log;
 import org.chromium.chromoting.jni.Client;
 import org.chromium.chromoting.jni.Display;
 
 /**
  * The user interface for viewing and interacting with a specific remote host.
  * It provides a canvas onto which the video feed is rendered, handles
  * multitouch pan and zoom gestures, and collects and forwards input events.
  */
 /** GUI element that holds the drawing canvas. */
-public class DesktopView extends SurfaceView implements DesktopViewInterface,
-        SurfaceHolder.Callback {
+public class DesktopView extends AbstractDesktopView implements SurfaceHolder.Callback {
     /** Used to define the animation feedback shown when a user touches the screen. */
     public enum InputFeedbackType { NONE, SMALL_ANIMATION, LARGE_ANIMATION }
 
     private static final String TAG = "Chromoting";
 
     private final RenderData mRenderData;
     private final TouchInputHandler mInputHandler;
 
     /** The parent Desktop activity. */
     private Desktop mDesktop;
@@ skipping 22 matching lines @@
     private final Event.Raisable<TouchEventParameter> mOnTouch = new Event.Raisable<>();
 
     // Variables to control animation by the TouchInputHandler.
 
     /** Protects mInputAnimationRunning. */
     private final Object mAnimationLock = new Object();
 
     /** Whether the TouchInputHandler has requested animation to be performed. */
     private boolean mInputAnimationRunning = false;
 
-    public DesktopView(Context context, AttributeSet attributes) {
-        super(context, attributes);
+    public DesktopView(Context context, Display display) {

[Hzj_jie, 2016/07/10 19:23:59]

Since we are not using Android internal way to create AbstractDesktopView
anymore, I would suggest to include Client in the constructor parameter, and
remove init function.

[Yuwei, 2016/07/11 00:17:09]

Sure

+        super(context);
+
+        Preconditions.notNull(display);
+        mDisplay = display;
 
         // Give this view keyboard focus, allowing us to customize the soft keyboard's settings.
         setFocusableInTouchMode(true);
 
         mRenderData = new RenderData();
         mInputHandler = new TouchInputHandler(this, context, mRenderData);
 
         mRepaintPending = false;
 
         getHolder().addCallback(this);
     }
 
     @Override
     public void init(Desktop desktop, Client client) {
         Preconditions.isNull(mDesktop);
         Preconditions.isNull(mClient);
-        Preconditions.isNull(mDisplay);
         Preconditions.notNull(desktop);
         Preconditions.notNull(client);
-        Preconditions.notNull(client.getDisplay());
-        Preconditions.isTrue(client.getDisplay() instanceof Display);
         mDesktop = desktop;
         mClient = client;
-        mDisplay = (Display) client.getDisplay();
         mInputHandler.init(desktop, new InputEventSender(client));
     }
 
     public Event<PaintEventParameter> onPaint() {
         return mOnPaint;
     }
 
     public Event<SizeChangedEventParameter> onClientSizeChanged() {
         return mOnClientSizeChanged;
     }
@@ skipping 229 matching lines @@
     @Override
     public void setAnimationEnabled(boolean enabled) {
         synchronized (mAnimationLock) {
             if (enabled && !mInputAnimationRunning) {
                 requestRepaint();
             }
             mInputAnimationRunning = enabled;
         }
     }
 }