am 26b49a7d: Merge "Be sure to update the display metrics on config change." into klp-dev

* commit '26b49a7dbbeda13f62200c2a04984b638e7aa1ea':
  Be sure to update the display metrics on config change.

1 files changed, 3 insertions, 2 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
index 3ddcb1b03b51..0e52605a6b68 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -343,7 +343,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode {
     public void start() {
         mDisplay = ((WindowManager)mContext.getSystemService(Context.WINDOW_SERVICE))
                 .getDefaultDisplay();
-        mDisplay.getSize(mCurrentDisplaySize);
+        updateDisplaySize();
 
         super.start(); // calls createAndAddWindows()
 
@@ -2304,6 +2304,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode {
     // called by makeStatusbar and also by PhoneStatusBarView
     void updateDisplaySize() {
         mDisplay.getMetrics(mDisplayMetrics);
+        mDisplay.getSize(mCurrentDisplaySize);
         if (DEBUG_GESTURES) {
             mGestureRec.tag("display",
                     String.format("%dx%d", mDisplayMetrics.widthPixels, mDisplayMetrics.heightPixels));
@@ -2475,7 +2476,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode {
         if (DEBUG) {
             Log.v(TAG, "configuration changed: " + mContext.getResources().getConfiguration());
         }
-        mDisplay.getSize(mCurrentDisplaySize);
+        updateDisplaySize(); // populates mDisplayMetrics
 
         updateResources();
         repositionNavigationBar();