diff options
| author | Craig Mautner <cmautner@google.com> | 2013-04-19 14:38:47 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-19 14:38:47 -0700 |
| commit | 570e07c7906943d7afa34af2aed1b37cf4bdbf78 (patch) | |
| tree | 49f624077e17d08fd3fde0bb934480f992de33b7 | |
| parent | e4396c9dfc77a66c6e5d15f978e115cbf0f20e88 (diff) | |
| parent | 0cf469f21a3df42c204d9569f3d5fe465331b59d (diff) | |
| download | frameworks_base-570e07c7906943d7afa34af2aed1b37cf4bdbf78.zip frameworks_base-570e07c7906943d7afa34af2aed1b37cf4bdbf78.tar.gz frameworks_base-570e07c7906943d7afa34af2aed1b37cf4bdbf78.tar.bz2 | |
am 0cf469f2: am c1876b25: Merge "Improve javadoc for rotationAnimation." into jb-mr2-dev
* commit '0cf469f21a3df42c204d9569f3d5fe465331b59d':
Improve javadoc for rotationAnimation.
| -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 2dcda58..0fe582b 100644 --- a/core/java/android/view/WindowManager.java +++ b/core/java/android/view/WindowManager.java @@ -1282,10 +1282,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 @@ -1370,7 +1371,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 |