diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-06-24 12:26:17 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-24 12:26:17 -0700 |
| commit | fa5e3b658f3f42eabec82c9f8e44d8a4cc565249 (patch) | |
| tree | 75314a4799516449654fc97375d62e33bc94b5e2 /core/java/android/view/Display.java | |
| parent | f49e4d3f182071081537dba3387db20cae27c427 (diff) | |
| parent | 2dafe771bb7ad4b15db6b740fd3ccb8f0fae836d (diff) | |
am 2dafe771: Merge "DO NOT MERGE. Fix density compat mode." into honeycomb-mr2
* commit '2dafe771bb7ad4b15db6b740fd3ccb8f0fae836d':
DO NOT MERGE. Fix density compat mode.
Diffstat (limited to 'core/java/android/view/Display.java')
| -rw-r--r-- | core/java/android/view/Display.java | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/core/java/android/view/Display.java b/core/java/android/view/Display.java index 3fa8dfdb7c53..2be5a4955981 100644 --- a/core/java/android/view/Display.java +++ b/core/java/android/view/Display.java @@ -107,8 +107,8 @@ public class Display { CompatibilityInfo ci; if (doCompat && (ci=mCompatibilityInfo.getIfNeeded()) != null) { synchronized (mTmpMetrics) { - mTmpMetrics.unscaledWidthPixels = outSize.x; - mTmpMetrics.unscaledHeightPixels = outSize.y; + mTmpMetrics.noncompatWidthPixels = outSize.x; + mTmpMetrics.noncompatHeightPixels = outSize.y; mTmpMetrics.density = mDensity; ci.applyToDisplayMetrics(mTmpMetrics); outSize.x = mTmpMetrics.widthPixels; @@ -268,14 +268,15 @@ public class Display { } private void getNonSizeMetrics(DisplayMetrics outMetrics) { - outMetrics.density = mDensity; outMetrics.densityDpi = (int)((mDensity*DisplayMetrics.DENSITY_DEFAULT)+.5f); - outMetrics.scaledDensity= outMetrics.density; - outMetrics.xdpi = mDpiX; - outMetrics.ydpi = mDpiY; - outMetrics.unscaledWidthPixels = outMetrics.widthPixels; - outMetrics.unscaledHeightPixels = outMetrics.heightPixels; + outMetrics.noncompatWidthPixels = outMetrics.widthPixels; + outMetrics.noncompatHeightPixels = outMetrics.heightPixels; + + outMetrics.density = outMetrics.noncompatDensity = mDensity; + outMetrics.scaledDensity = outMetrics.noncompatScaledDensity = outMetrics.density; + outMetrics.xdpi = outMetrics.noncompatXdpi = mDpiX; + outMetrics.ydpi = outMetrics.noncompatYdpi = mDpiY; } static IWindowManager getWindowManager() { |