Merge "Un-hide ROTATION_ANIMATION_SEAMLESS."

4 files changed, 13 insertions, 10 deletions

diff --git a/api/current.txt b/api/current.txt
index 2beea12251ed..58d334193866 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -44023,6 +44023,7 @@ package android.view {
     field public static final int ROTATION_ANIMATION_CHANGED = 4096; // 0x1000
     field public static final int ROTATION_ANIMATION_CROSSFADE = 1; // 0x1
     field public static final int ROTATION_ANIMATION_JUMPCUT = 2; // 0x2
+    field public static final int ROTATION_ANIMATION_SEAMLESS = 3; // 0x3
     field public static final int ROTATION_ANIMATION_ROTATE = 0; // 0x0
     field public static final int SCREEN_BRIGHTNESS_CHANGED = 2048; // 0x800
     field public static final int SCREEN_ORIENTATION_CHANGED = 1024; // 0x400
diff --git a/api/system-current.txt b/api/system-current.txt
index db8a5018ebf9..7805ae301d44 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -47207,6 +47207,7 @@ package android.view {
     field public static final int ROTATION_ANIMATION_CHANGED = 4096; // 0x1000
     field public static final int ROTATION_ANIMATION_CROSSFADE = 1; // 0x1
     field public static final int ROTATION_ANIMATION_JUMPCUT = 2; // 0x2
+    field public static final int ROTATION_ANIMATION_SEAMLESS = 3; // 0x3
     field public static final int ROTATION_ANIMATION_ROTATE = 0; // 0x0
     field public static final int SCREEN_BRIGHTNESS_CHANGED = 2048; // 0x800
     field public static final int SCREEN_ORIENTATION_CHANGED = 1024; // 0x400
diff --git a/api/test-current.txt b/api/test-current.txt
index e9f2f0e46f7b..bde0e41d9050 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -44259,6 +44259,7 @@ package android.view {
     field public static final int ROTATION_ANIMATION_CHANGED = 4096; // 0x1000
     field public static final int ROTATION_ANIMATION_CROSSFADE = 1; // 0x1
     field public static final int ROTATION_ANIMATION_JUMPCUT = 2; // 0x2
+    field public static final int ROTATION_ANIMATION_SEAMLESS = 3; // 0x3
     field public static final int ROTATION_ANIMATION_ROTATE = 0; // 0x0
     field public static final int SCREEN_BRIGHTNESS_CHANGED = 2048; // 0x800
     field public static final int SCREEN_ORIENTATION_CHANGED = 1024; // 0x400
diff --git a/core/java/android/view/WindowManager.java b/core/java/android/view/WindowManager.java
index abb305121ea8..f14acaaf43c6 100644
--- a/core/java/android/view/WindowManager.java
+++ b/core/java/android/view/WindowManager.java
@@ -1578,30 +1578,30 @@ public interface WindowManager extends ViewManager {
         public float buttonBrightness = BRIGHTNESS_OVERRIDE_NONE;
 
         /**
-         * Value for {@link #rotationAnimation} to define the animation used to
-         * specify that this window will rotate in or out following a rotation.
+         * Value for {@link #rotationAnimation} which specifies that this
+         * window will visually rotate in or out following a rotation.
          */
         public static final int ROTATION_ANIMATION_ROTATE = 0;
 
         /**
-         * Value for {@link #rotationAnimation} to define the animation used to
-         * specify that this window will fade in or out following a rotation.
+         * Value for {@link #rotationAnimation} which specifies that this
+         * window will fade in or out following a rotation.
          */
         public static final int ROTATION_ANIMATION_CROSSFADE = 1;
 
         /**
-         * Value for {@link #rotationAnimation} to define the animation used to
-         * specify that this window will immediately disappear or appear following
-         * a rotation.
+         * Value for {@link #rotationAnimation} which specifies that this window
+         * will immediately disappear or appear following a rotation.
          */
         public static final int ROTATION_ANIMATION_JUMPCUT = 2;
 
         /**
          * Value for {@link #rotationAnimation} to specify seamless rotation mode.
          * This works like JUMPCUT but will fall back to CROSSFADE if rotation
-         * can't be applied without pausing the screen.
-         *
-         * @hide
+         * can't be applied without pausing the screen. For example, this is ideal
+         * for Camera apps which don't want the viewfinder contents to ever rotate
+         * or fade (and rather to be seamless) but also don't want ROTATION_ANIMATION_JUMPCUT
+         * during app transition scenarios where seamless rotation can't be applied.
          */
         public static final int ROTATION_ANIMATION_SEAMLESS = 3;