am 29cd79c: am c986d6f: Merge "Fix issue #5906017: Missing menu entries in portrait when in compatibility mode" into ics-mr1

* commit '29cd79c7b0fecd2753fc27405794c0d5b5314302':
  Fix issue #5906017: Missing menu entries in portrait when in compatibility mode

Author: Dianne Hackborn

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

@@ -2044,6 +2044,12 @@ public void beginLayoutLw(int displayWidth, int displayHeight, int displayRotati
                         mTmpNavigationFrame.offset(mNavigationBarWidth, 0);
                     }
                 }
+                // Make sure the content and current rectangles are updated to
+                // account for the restrictions from the navigation bar.
+                mContentTop = mCurTop = mDockTop;
+                mContentBottom = mCurBottom = mDockBottom;
+                mContentLeft = mCurLeft = mDockLeft;
+                mContentRight = mCurRight = mDockRight;
                 // And compute the final frame.
                 mNavigationBar.computeFrameLw(mTmpNavigationFrame, mTmpNavigationFrame,
                         mTmpNavigationFrame, mTmpNavigationFrame);