diff options
| author | Bill Yi <byi@google.com> | 2014-04-29 16:07:29 -0700 |
|---|---|---|
| committer | Bill Yi <byi@google.com> | 2014-04-29 16:07:29 -0700 |
| commit | 293513a59d36cd96a3e474dde5981380d372d8c9 (patch) | |
| tree | 4268c9994be194a7f4fccdecd089af58516d0953 /core/java/android/widget/PopupWindow.java | |
| parent | 1866e5dc8bb04b58a67e54f66cb4ec22e878667d (diff) | |
| parent | 0b62467b142b61ee1e449ba958ba37dfd961ef56 (diff) | |
| download | frameworks_base-293513a59d36cd96a3e474dde5981380d372d8c9.zip frameworks_base-293513a59d36cd96a3e474dde5981380d372d8c9.tar.gz frameworks_base-293513a59d36cd96a3e474dde5981380d372d8c9.tar.bz2 | |
Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEAD
Diffstat (limited to 'core/java/android/widget/PopupWindow.java')
| -rw-r--r-- | core/java/android/widget/PopupWindow.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/widget/PopupWindow.java b/core/java/android/widget/PopupWindow.java index 5663959..be20d2d 100644 --- a/core/java/android/widget/PopupWindow.java +++ b/core/java/android/widget/PopupWindow.java @@ -1330,7 +1330,7 @@ public class PopupWindow { /** * Updates the state of the popup window, if it is currently being displayed, - * from the currently set state. This include: + * from the currently set state. This includes: * {@link #setClippingEnabled(boolean)}, {@link #setFocusable(boolean)}, * {@link #setIgnoreCheekPress()}, {@link #setInputMethodMode(int)}, * {@link #setTouchable(boolean)}, and {@link #setAnimationStyle(int)}. |