summaryrefslogtreecommitdiff
path: root/core/java/android/inputmethodservice/SoftInputWindow.java
diff options
context:
space:
mode:
authorAndrew Solovay <asolovay@google.com>2018-10-04 14:59:09 -0700
committerAndrew Solovay <asolovay@google.com>2018-10-04 22:50:39 +0000
commitd10e384d6cd51bf2e15b378a6ab80fa24df476ee (patch)
tree677518664b57fee2443ab2996d6afc3de2b330f9 /core/java/android/inputmethodservice/SoftInputWindow.java
parent5d82f62bdb75c28b87fd00598c8ac9f900ac81be (diff)
parenta3e34fe9fe4e2a8d0932e574721e5a8b94396c5e (diff)
resolve merge conflicts of a3e34fe9fe4e2a8d0932e574721e5a8b94396c5e to pi-dev-plus-aosp
Bug: None Test: Eyeballed (comment-only change). Change-Id: Ia644cde66376b2bddeb27bb2a147b3266037aa2c Exempt-From-Owner-Approval: Docs-only change Merged-In: Ia06e1fffd814671289a1caebd5962aedc18a28d7
Diffstat (limited to 'core/java/android/inputmethodservice/SoftInputWindow.java')
-rw-r--r--core/java/android/inputmethodservice/SoftInputWindow.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/inputmethodservice/SoftInputWindow.java b/core/java/android/inputmethodservice/SoftInputWindow.java
index b4b88871d251..0513feef801f 100644
--- a/core/java/android/inputmethodservice/SoftInputWindow.java
+++ b/core/java/android/inputmethodservice/SoftInputWindow.java
@@ -162,9 +162,9 @@ public class SoftInputWindow extends Dialog {
/**
* Set which boundary of the screen the DockWindow sticks to.
*
- * @param gravity The boundary of the screen to stick. See {#link
- * android.view.Gravity.LEFT}, {#link android.view.Gravity.TOP},
- * {#link android.view.Gravity.BOTTOM}, {#link
+ * @param gravity The boundary of the screen to stick. See {@link
+ * android.view.Gravity.LEFT}, {@link android.view.Gravity.TOP},
+ * {@link android.view.Gravity.BOTTOM}, {@link
* android.view.Gravity.RIGHT}.
*/
public void setGravity(int gravity) {