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.
This commit is contained in:
Daniel Sandler
2013-10-11 08:01:16 -07:00
committed by Android Git Automerger

View File

@@ -343,7 +343,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode {
public void start() { public void start() {
mDisplay = ((WindowManager)mContext.getSystemService(Context.WINDOW_SERVICE)) mDisplay = ((WindowManager)mContext.getSystemService(Context.WINDOW_SERVICE))
.getDefaultDisplay(); .getDefaultDisplay();
mDisplay.getSize(mCurrentDisplaySize); updateDisplaySize();
super.start(); // calls createAndAddWindows() super.start(); // calls createAndAddWindows()
@@ -2304,6 +2304,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode {
// called by makeStatusbar and also by PhoneStatusBarView // called by makeStatusbar and also by PhoneStatusBarView
void updateDisplaySize() { void updateDisplaySize() {
mDisplay.getMetrics(mDisplayMetrics); mDisplay.getMetrics(mDisplayMetrics);
mDisplay.getSize(mCurrentDisplaySize);
if (DEBUG_GESTURES) { if (DEBUG_GESTURES) {
mGestureRec.tag("display", mGestureRec.tag("display",
String.format("%dx%d", mDisplayMetrics.widthPixels, mDisplayMetrics.heightPixels)); String.format("%dx%d", mDisplayMetrics.widthPixels, mDisplayMetrics.heightPixels));
@@ -2475,7 +2476,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode {
if (DEBUG) { if (DEBUG) {
Log.v(TAG, "configuration changed: " + mContext.getResources().getConfiguration()); Log.v(TAG, "configuration changed: " + mContext.getResources().getConfiguration());
} }
mDisplay.getSize(mCurrentDisplaySize); updateDisplaySize(); // populates mDisplayMetrics
updateResources(); updateResources();
repositionNavigationBar(); repositionNavigationBar();