[Chromoting] Decouple DesktopView and TouchInputHandler

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.graphics.Rect;
 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;
@@ skipping 51 matching lines @@
         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.notNull(desktop);
+        Preconditions.notNull(client);
+        mDesktop = desktop;
+        mClient = client;
+        mInputHandler.init(desktop, client);
+    }
+
     public Event<PaintEventParameter> onPaint() {
         return mOnPaint;
     }
 
-    public void setDesktop(Desktop desktop) {
-        mDesktop = desktop;
-    }
-
-    public void setClient(Client client) {
-        mClient = client;
-    }
-
-    /** See {@link TouchInputHandler#onSoftInputMethodVisibilityChanged} for API details. */
-    public void onSoftInputMethodVisibilityChanged(boolean inputMethodVisible, Rect bounds) {
-        mInputHandler.onSoftInputMethodVisibilityChanged(inputMethodVisible, bounds);
-    }
-
     /** Request repainting of the desktop view. */
     void requestRepaint() {
         synchronized (mRenderData) {
             if (mRepaintPending) {
                 return;
             }
             mRepaintPending = true;
         }
         mClient.getDisplay().redrawGraphics();
     }
@@ skipping 197 matching lines @@
 
     @Override
     public void setAnimationEnabled(boolean enabled) {
         synchronized (mAnimationLock) {
             if (enabled && !mInputAnimationRunning) {
                 requestRepaint();
             }
             mInputAnimationRunning = enabled;
         }
     }
-
-    /** Updates the current InputStrategy used by the TouchInputHandler. */
-    public void changeInputMode(
-            Desktop.InputMode inputMode, CapabilityManager.HostCapability hostTouchCapability) {
-        // We need both input mode and host input capabilities to select the input strategy.
-        if (!inputMode.isSet() || !hostTouchCapability.isSet()) {
-            return;
-        }
-
-        switch (inputMode) {
-            case TRACKPAD:
-                mInputHandler.setInputStrategy(new TrackpadInputStrategy(mRenderData, mClient));
-                break;
-
-            case TOUCH:
-                if (hostTouchCapability.isSupported()) {
-                    mInputHandler.setInputStrategy(new TouchInputStrategy(mRenderData, mClient));
-                } else {
-                    mInputHandler.setInputStrategy(
-                            new SimulatedTouchInputStrategy(mRenderData, mClient, getContext()));
-                }
-                break;
-
-            default:
-                // Unreachable, but required by Google Java style and findbugs.
-                assert false : "Unreached";
-        }
-
-        // Ensure the cursor state is updated appropriately.
-        requestRepaint();
-    }
 }