diff options
| author | John Spurlock <jspurlock@google.com> | 2013-04-18 20:14:52 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-18 20:14:53 +0000 |
| commit | cabe99bb5d6fa6b5d6c370dd7b338117cc44d2ab (patch) | |
| tree | d68b19755d3ab4daf24ada4559df886134b8a8f8 | |
| parent | ab0a89041234a95e73f0a32bafca443ed9a19d74 (diff) | |
| parent | 600cba973fa6889728cd7ee9938ede12c80c005a (diff) | |
| download | frameworks_base-cabe99bb5d6fa6b5d6c370dd7b338117cc44d2ab.zip frameworks_base-cabe99bb5d6fa6b5d6c370dd7b338117cc44d2ab.tar.gz frameworks_base-cabe99bb5d6fa6b5d6c370dd7b338117cc44d2ab.tar.bz2 | |
Merge "Input-related documentation fixes."
| -rw-r--r-- | core/java/android/view/InputEvent.java | 2 | ||||
| -rw-r--r-- | core/java/android/view/InputFilter.java | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/view/InputEvent.java b/core/java/android/view/InputEvent.java index 24c3128..1ecdf30 100644 --- a/core/java/android/view/InputEvent.java +++ b/core/java/android/view/InputEvent.java @@ -70,7 +70,7 @@ public abstract class InputEvent implements Parcelable { * Gets the source of the event. * * @return The event source or {@link InputDevice#SOURCE_UNKNOWN} if unknown. - * @see InputDevice#getSourceInfo + * @see InputDevice#getSources */ public abstract int getSource(); diff --git a/core/java/android/view/InputFilter.java b/core/java/android/view/InputFilter.java index c25b87b..4aba30c 100644 --- a/core/java/android/view/InputFilter.java +++ b/core/java/android/view/InputFilter.java @@ -40,7 +40,7 @@ import android.view.WindowManagerPolicy; * <li>Input events are then asynchronously delivered to the input filter's * {@link #onInputEvent(InputEvent)} method instead of being enqueued for dispatch to * applications as usual. The input filter only receives input events that were - * generated by input device; the input filter will not receive input events that were + * generated by an input device; the input filter will not receive input events that were * injected into the system by other means, such as by instrumentation.</li> * <li>The input filter processes and optionally transforms the stream of events. For example, * it may transform a sequence of motion events representing an accessibility gesture into @@ -68,7 +68,7 @@ import android.view.WindowManagerPolicy; * The input filter must take into account the fact that the input events coming from different * devices or even different sources all consist of distinct streams of input. * Use {@link InputEvent#getDeviceId()} and {@link InputEvent#getSource()} to identify - * the source of the event and its semantics. There are be multiple sources of keys, + * the source of the event and its semantics. There may be multiple sources of keys, * touches and other input: they must be kept separate. * </p> * <h3>Policy flags</h3> @@ -88,7 +88,7 @@ import android.view.WindowManagerPolicy; * The input filter should clear its internal state about the gesture and then send key or * motion events to the dispatcher to cancel any keys or pointers that are down. * </p><p> - * Corollary: Events that set sent to the dispatcher should usually include the + * Corollary: Events that get sent to the dispatcher should usually include the * {@link WindowManagerPolicy#FLAG_PASS_TO_USER} flag. Otherwise, they will be dropped! * </p><p> * It may be prudent to disable automatic key repeating for synthetic key events |