commit db906a7c9a8f2af79745d80abe439398ceb3d7be
author Tadashi G. Takaoka <takaoka@google.com> Mon Jan 21 08:34:25 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jan 21 08:34:25 2013 +0000
tree e62e237c5ad00d7365ea34be8780b010d31f140d
parent f3c4cd45a5df6f90b922ea44db259e53117bb25a
parent 2ecbfe8e93f8d8fce0adc47659b5d2f52cb68849

Merge "Rename AbstractDrawingPreview.onDraw to drawPreview"

java/src/com/android/inputmethod/keyboard/internal/AbstractDrawingPreview.java

diff --git a/java/src/com/android/inputmethod/keyboard/internal/AbstractDrawingPreview.java b/java/src/com/android/inputmethod/keyboard/internal/AbstractDrawingPreview.java
index 8a3f064..501bde0 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/AbstractDrawingPreview.java
+++ b/java/src/com/android/inputmethod/keyboard/internal/AbstractDrawingPreview.java
@@ -39,7 +39,7 @@
      * Draws the preview
      * @param canvas The canvas where the preview is drawn.
      */
-    public abstract void onDraw(final Canvas canvas);
+    public abstract void drawPreview(final Canvas canvas);
 
     /**
      * Set the position of the preview.

java/src/com/android/inputmethod/keyboard/internal/GestureFloatingPreviewText.java

diff --git a/java/src/com/android/inputmethod/keyboard/internal/GestureFloatingPreviewText.java b/java/src/com/android/inputmethod/keyboard/internal/GestureFloatingPreviewText.java
index 897d856..2c5bb59 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/GestureFloatingPreviewText.java
+++ b/java/src/com/android/inputmethod/keyboard/internal/GestureFloatingPreviewText.java
@@ -130,7 +130,7 @@
      * @param canvas The canvas where preview text is drawn.
      */
     @Override
-    public void onDraw(final Canvas canvas) {
+    public void drawPreview(final Canvas canvas) {
         if (!isPreviewEnabled() || mSuggestedWords.isEmpty()
                 || TextUtils.isEmpty(mSuggestedWords.getWord(0))) {
             return;

java/src/com/android/inputmethod/keyboard/internal/PreviewPlacerView.java

diff --git a/java/src/com/android/inputmethod/keyboard/internal/PreviewPlacerView.java b/java/src/com/android/inputmethod/keyboard/internal/PreviewPlacerView.java
index 4471cd0..d344742 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/PreviewPlacerView.java
+++ b/java/src/com/android/inputmethod/keyboard/internal/PreviewPlacerView.java
@@ -220,7 +220,7 @@
                 // rectangle on the canvas.
             }
         }
-        mGestureFloatingPreviewText.onDraw(canvas);
+        mGestureFloatingPreviewText.drawPreview(canvas);
         if (mShowSlidingKeyInputPreview) {
             drawSlidingKeyInputPreview(canvas);
         }