diff options
| author | Craig Mautner <cmautner@google.com> | 2013-04-19 14:32:44 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-19 14:32:44 -0700 |
| commit | 0cf469f21a3df42c204d9569f3d5fe465331b59d (patch) | |
| tree | 18e611228f1bc76d7d9429e1ac8760c8cfafd8f6 /core/java/android/view/WindowManager.java | |
| parent | 10786aa1d64897f9d1160954d259c81364b10a43 (diff) | |
| parent | c1876b256cff17ebf33e32c5a0cdaaeb7d8be2ec (diff) | |
am c1876b25: Merge "Improve javadoc for rotationAnimation." into jb-mr2-dev
* commit 'c1876b256cff17ebf33e32c5a0cdaaeb7d8be2ec':
Improve javadoc for rotationAnimation.
Diffstat (limited to 'core/java/android/view/WindowManager.java')
| -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 0212482f8961..d52b1f3f21fe 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 |