Merge "Update DisplayMetrics even on default display" into nyc-mr1-dev (4510b9af) · Commits · e / os / android_frameworks_base

core/java/android/app/ResourcesManager.java

+12 −12

Original line number	Diff line number	Diff line
		@@ -839,9 +839,9 @@ public class ResourcesManager {
		tmpConfig = new Configuration();
		}
		tmpConfig.setTo(config);
		if (!isDefaultDisplay) {

		// Get new DisplayMetrics based on the DisplayAdjustments given
		// to the ResourcesImpl. Udate a copy if the CompatibilityInfo
		// to the ResourcesImpl. Update a copy if the CompatibilityInfo
		// changed, because the ResourcesImpl object will handle the
		// update internally.
		DisplayAdjustments daj = r.getDisplayAdjustments();
		@@ -851,7 +851,7 @@ public class ResourcesManager {
		}
		dm = getDisplayMetrics(displayId, daj);
		applyNonDefaultDisplayMetricsToConfiguration(dm, tmpConfig);
		}

		if (hasOverrideConfiguration) {
		tmpConfig.updateFrom(key.mOverrideConfiguration);
		}

+4 −0

Original line number	Diff line number	Diff line
		@@ -268,6 +268,10 @@ public class DisplayMetrics {
		}

		public void setTo(DisplayMetrics o) {
		if (this == o) {
		return;
		}

		widthPixels = o.widthPixels;
		heightPixels = o.heightPixels;
		density = o.density;