diff options
| author | Craig Mautner <cmautner@google.com> | 2013-04-19 21:30:20 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-19 21:30:21 +0000 |
| commit | c1876b256cff17ebf33e32c5a0cdaaeb7d8be2ec (patch) | |
| tree | b2d2a9129aa08a52819c07d17651e866c7d7503f /core/java/android | |
| parent | 26a54ecaa556f72086790caa133e5a8d31652d8a (diff) | |
| parent | bdcc9a5811f9a037a3c4145b7469380d2dfe214b (diff) | |
| download | frameworks_base-c1876b256cff17ebf33e32c5a0cdaaeb7d8be2ec.zip frameworks_base-c1876b256cff17ebf33e32c5a0cdaaeb7d8be2ec.tar.gz frameworks_base-c1876b256cff17ebf33e32c5a0cdaaeb7d8be2ec.tar.bz2 | |
Merge "Improve javadoc for rotationAnimation." into jb-mr2-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/view/WindowManager.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/core/java/android/view/WindowManager.java b/core/java/android/view/WindowManager.java index 0212482..d52b1f3 100644 --- a/core/java/android/view/WindowManager.java +++ b/core/java/android/view/WindowManager.java @@ -1274,10 +1274,11 @@ public interface WindowManager extends ViewManager { public static final int ROTATION_ANIMATION_JUMPCUT = 2; /** - * Define the animation used on this window for entry or exit following - * a rotation. This only works if the incoming and outgoing topmost + * Define the exit and entry animations used on this window when the device is rotated. + * This only has an affect if the incoming and outgoing topmost * opaque windows have the #FLAG_FULLSCREEN bit set and are not covered - * by other windows. + * by other windows. All other situations default to the + * {@link #ROTATION_ANIMATION_ROTATE} behavior. * * @see #ROTATION_ANIMATION_ROTATE * @see #ROTATION_ANIMATION_CROSSFADE @@ -1362,7 +1363,7 @@ public interface WindowManager extends ViewManager { /** * Control special features of the input subsystem. * - * @see #INPUT_FEATURE_DISABLE_TOUCH_PAD_GESTURES + * @see #INPUT_FEATURE_DISABLE_POINTER_GESTURES * @see #INPUT_FEATURE_NO_INPUT_CHANNEL * @see #INPUT_FEATURE_DISABLE_USER_ACTIVITY * @hide |