Move AbstractDrawingPreview objects to MainKeyboardView

Change-Id: I0be72fba9a66f7c326028ec8e4670ca74a46053f

1 files changed, 21 insertions, 59 deletions

diff --git a/java/src/com/android/inputmethod/keyboard/internal/PreviewPlacerView.java b/java/src/com/android/inputmethod/keyboard/internal/PreviewPlacerView.java
index 10ef78441..23761103f 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/PreviewPlacerView.java
+++ b/java/src/com/android/inputmethod/keyboard/internal/PreviewPlacerView.java
@@ -17,7 +17,6 @@
 package com.android.inputmethod.keyboard.internal;
 
 import android.content.Context;
-import android.content.res.TypedArray;
 import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.PorterDuff;
@@ -25,78 +24,45 @@ import android.graphics.PorterDuffXfermode;
 import android.util.AttributeSet;
 import android.widget.RelativeLayout;
 
-import com.android.inputmethod.keyboard.PointerTracker;
+import com.android.inputmethod.latin.CollectionUtils;
 import com.android.inputmethod.latin.CoordinateUtils;
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.SuggestedWords;
+
+import java.util.ArrayList;
 
 public final class PreviewPlacerView extends RelativeLayout {
     private final int[] mKeyboardViewOrigin = CoordinateUtils.newInstance();
 
-    // TODO: Move these AbstractDrawingPvreiew objects to MainKeyboardView.
-    private final GestureFloatingPreviewText mGestureFloatingPreviewText;
-    private final GestureTrailsPreview mGestureTrailsPreview;
-    private final SlidingKeyInputPreview mSlidingKeyInputPreview;
+    private final ArrayList<AbstractDrawingPreview> mPreviews = CollectionUtils.newArrayList();
 
     public PreviewPlacerView(final Context context, final AttributeSet attrs) {
-        this(context, attrs, R.attr.keyboardViewStyle);
-    }
-
-    public PreviewPlacerView(final Context context, final AttributeSet attrs, final int defStyle) {
-        super(context);
+        super(context, attrs);
         setWillNotDraw(false);
 
-        final TypedArray mainKeyboardViewAttr = context.obtainStyledAttributes(
-                attrs, R.styleable.MainKeyboardView, defStyle, R.style.MainKeyboardView);
-        // TODO: mGestureFloatingPreviewText could be an instance of GestureFloatingPreviewText or
-        // MultiGesturePreviewText, depending on the user's choice in the settings.
-        mGestureFloatingPreviewText = new GestureFloatingPreviewText(this, mainKeyboardViewAttr);
-        mGestureTrailsPreview = new GestureTrailsPreview(this, mainKeyboardViewAttr);
-        mSlidingKeyInputPreview = new SlidingKeyInputPreview(this, mainKeyboardViewAttr);
-        mainKeyboardViewAttr.recycle();
-
         final Paint layerPaint = new Paint();
         layerPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_OVER));
         setLayerType(LAYER_TYPE_HARDWARE, layerPaint);
     }
 
+    public void addPreview(final AbstractDrawingPreview preview) {
+        mPreviews.add(preview);
+    }
+
     public void setKeyboardViewGeometry(final int[] originCoords, final int width,
             final int height) {
         CoordinateUtils.copy(mKeyboardViewOrigin, originCoords);
-        mGestureFloatingPreviewText.setKeyboardGeometry(originCoords, width, height);
-        mGestureTrailsPreview.setKeyboardGeometry(originCoords, width, height);
-        mSlidingKeyInputPreview.setKeyboardGeometry(originCoords, width, height);
-    }
-
-    // TODO: Move this method to MainKeyboardView
-    public void setGesturePreviewMode(final boolean drawsGesturePreviewTrail,
-            final boolean drawsGestureFloatingPreviewText) {
-        mGestureFloatingPreviewText.setPreviewEnabled(drawsGestureFloatingPreviewText);
-        mGestureTrailsPreview.setPreviewEnabled(drawsGesturePreviewTrail);
-    }
-
-    // TODO: Move this method to MainKeyboardView
-    public void invalidatePointer(final PointerTracker tracker) {
-        mGestureFloatingPreviewText.setPreviewPosition(tracker);
-        mGestureTrailsPreview.setPreviewPosition(tracker);
-    }
-
-    // TODO: Move this method to MainKeyboardView
-    public void showSlidingKeyInputPreview(final PointerTracker tracker) {
-        mSlidingKeyInputPreview.setPreviewPosition(tracker);
-    }
-
-    // TODO: Move this method to MainKeyboardView
-    public void dismissSlidingKeyInputPreview() {
-        mSlidingKeyInputPreview.dismissSlidingKeyInputPreview();
+        final int count = mPreviews.size();
+        for (int i = 0; i < count; i++) {
+            mPreviews.get(i).setKeyboardGeometry(originCoords, width, height);
+        }
     }
 
     @Override
     protected void onDetachedFromWindow() {
         super.onDetachedFromWindow();
-        mGestureFloatingPreviewText.onDetachFromWindow();
-        mGestureTrailsPreview.onDetachFromWindow();
-        mSlidingKeyInputPreview.onDetachFromWindow();
+        final int count = mPreviews.size();
+        for (int i = 0; i < count; i++) {
+            mPreviews.get(i).onDetachFromWindow();
+        }
     }
 
     @Override
@@ -105,14 +71,10 @@ public final class PreviewPlacerView extends RelativeLayout {
         final int originX = CoordinateUtils.x(mKeyboardViewOrigin);
         final int originY = CoordinateUtils.y(mKeyboardViewOrigin);
         canvas.translate(originX, originY);
-        mGestureFloatingPreviewText.drawPreview(canvas);
-        mGestureTrailsPreview.drawPreview(canvas);
-        mSlidingKeyInputPreview.drawPreview(canvas);
+        final int count = mPreviews.size();
+        for (int i = 0; i < count; i++) {
+            mPreviews.get(i).drawPreview(canvas);
+        }
         canvas.translate(-originX, -originY);
     }
-
-    // TODO: Move this method to MainKeyboardView.
-    public void setGestureFloatingPreviewText(final SuggestedWords suggestedWords) {
-        mGestureFloatingPreviewText.setSuggetedWords(suggestedWords);
-    }
 }