Merge "Disable seamless rotation when nav bar jumps."

2016-10-27 19:26:01 +00:00
parent 4452e751d4 0b9ac5a20f
commit bda8650ecb
1 changed files with 6 additions and 0 deletions
--- a/services/core/java/com/android/server/policy/PhoneWindowManager.java
+++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -7922,6 +7922,12 @@ public class PhoneWindowManager implements WindowManagerPolicy {
        if (oldRotation == mUpsideDownRotation || newRotation == mUpsideDownRotation) {
            return false;
        }
+        // If the navigation bar can't change sides, then it will
+        // jump when we change orientations and we don't rotate
+        // seamlessly.
+        if (!mNavigationBarCanMove) {
+            return false;
+        }
        int delta = newRotation - oldRotation;
        if (delta < 0) delta += 4;
        // Likewise we don't rotate seamlessly for 180 degree rotations