From f8a7ceaef2e7d5cd530c9426bde91b6fa9a40b75 Mon Sep 17 00:00:00 2001
From: Andy Stadler <>
Date: Fri, 10 Apr 2009 16:24:47 -0700
Subject: AI 145778: Manual merge changes 145382-145384 from cupcake.

Automated import of CL 145778
---
 core/java/android/inputmethodservice/KeyboardView.java | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'core/java/android/inputmethodservice/KeyboardView.java')

diff --git a/core/java/android/inputmethodservice/KeyboardView.java b/core/java/android/inputmethodservice/KeyboardView.java
index 9b8b5dba0f3c..65c989377e86 100755
--- a/core/java/android/inputmethodservice/KeyboardView.java
+++ b/core/java/android/inputmethodservice/KeyboardView.java
@@ -486,19 +486,17 @@ public class KeyboardView extends View implements View.OnClickListener {
     }
 
     /**
-     * Enables or disables proximity correction. When enabled, {@link OnKeyboardActionListener#onKey}
-     * gets called with key codes for adjacent keys. Otherwise only the primary code is returned.
+     * When enabled, calls to {@link OnKeyboardActionListener#onKey} will include key
+     * codes for adjacent keys.  When disabled, only the primary key code will be
+     * reported.
      * @param enabled whether or not the proximity correction is enabled
-     * @hide Pending API Council approval
      */
     public void setProximityCorrectionEnabled(boolean enabled) {
         mProximityCorrectOn = enabled;
     }
 
     /**
-     * Returns the enabled state of the proximity correction.
-     * @return true if proximity correction is enabled, false otherwise
-     * @hide Pending API Council approval
+     * Returns true if proximity correction is enabled.
      */
     public boolean isProximityCorrectionEnabled() {
         return mProximityCorrectOn;
-- 
cgit v1.2.3