diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-05-25 16:36:50 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2011-05-25 16:36:50 -0700 |
| commit | fee1c69a49d03b651e481983432ade94fc07650a (patch) | |
| tree | 9e7cfad06ab1fb8e6fcb1ccd3fa60cf6d1b2f103 /core/java/android/view/ViewAncestor.java | |
| parent | 1b9b34adf704c2c059ca439ace0c0b67c8c272f3 (diff) | |
| parent | 77dd616e685e2671491d911d0847efa4f832717e (diff) | |
| download | frameworks_base-fee1c69a49d03b651e481983432ade94fc07650a.zip frameworks_base-fee1c69a49d03b651e481983432ade94fc07650a.tar.gz frameworks_base-fee1c69a49d03b651e481983432ade94fc07650a.tar.bz2 | |
resolved conflicts for merge of 77dd616e to master
Change-Id: Idb7180177b01e7d822327ccc7c76617220860da2
Diffstat (limited to 'core/java/android/view/ViewAncestor.java')
| -rw-r--r-- | core/java/android/view/ViewAncestor.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/core/java/android/view/ViewAncestor.java b/core/java/android/view/ViewAncestor.java index bf04502..bd33a6a 100644 --- a/core/java/android/view/ViewAncestor.java +++ b/core/java/android/view/ViewAncestor.java @@ -380,9 +380,8 @@ public final class ViewAncestor extends Handler implements ViewParent, CompatibilityInfo compatibilityInfo = resources.getCompatibilityInfo(); mTranslator = compatibilityInfo.getTranslator(); - if (mTranslator != null || !compatibilityInfo.supportsScreen()) { - mSurface.setCompatibleDisplayMetrics(resources.getDisplayMetrics(), - mTranslator); + if (mTranslator != null) { + mSurface.setCompatibilityTranslator(mTranslator); } boolean restore = false; |