Merge "NavBar: Don't resize in portrait docks when HDMI connected." into jb-dev

Author: John Spurlock

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

@@ -2278,7 +2278,12 @@ public void beginLayoutLw(int displayWidth, int displayHeight, int displayRotati
                 // It's a system nav bar or a portrait screen; nav bar goes on bottom.
                 int top = displayHeight - mNavigationBarHeightForRotation[displayRotation];
                 if (mHdmiPlugged) {
-                    if (top > mExternalDisplayHeight) {
+                    // Move the nav bar up if the external display is the same aspect ratio
+                    // but shorter.  This avoids clipping on the external display.
+                    boolean sameAspect = mExternalDisplayHeight > 0 && displayHeight > 0
+                        && ((float) mExternalDisplayWidth / mExternalDisplayHeight > 1)
+                        == ((float) displayWidth / displayHeight > 1);
+                    if (sameAspect && top > mExternalDisplayHeight) {
                         top = mExternalDisplayHeight;
                     }
                 }