diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-30 16:05:27 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-07-30 16:05:27 -0700 |
| commit | afcf686cb070313ae5ce6c54ac381a3a86a60ed2 (patch) | |
| tree | 4a7c1fa186ad4b1a7d37ea4d97aa0b0411b50d85 /core/java/android/view | |
| parent | 8845ea0592e3bffc726febb66de48646b0398e70 (diff) | |
| parent | 25dff70f153529b87f5ad4a92f4de21e8950b1de (diff) | |
| download | frameworks_base-afcf686cb070313ae5ce6c54ac381a3a86a60ed2.zip frameworks_base-afcf686cb070313ae5ce6c54ac381a3a86a60ed2.tar.gz frameworks_base-afcf686cb070313ae5ce6c54ac381a3a86a60ed2.tar.bz2 | |
am 25dff70f: Merge change 9039 into donut
Merge commit '25dff70f153529b87f5ad4a92f4de21e8950b1de'
* commit '25dff70f153529b87f5ad4a92f4de21e8950b1de':
Fix #2018814: System cannot correctly render assets with "wrap_content" attribute in QVGA
Diffstat (limited to 'core/java/android/view')
| -rw-r--r-- | core/java/android/view/ViewRoot.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/core/java/android/view/ViewRoot.java b/core/java/android/view/ViewRoot.java index 884950f..0d44b4e 100644 --- a/core/java/android/view/ViewRoot.java +++ b/core/java/android/view/ViewRoot.java @@ -21,7 +21,6 @@ import com.android.internal.view.IInputMethodSession; import android.graphics.Canvas; import android.graphics.PixelFormat; -import android.graphics.Point; import android.graphics.PorterDuff; import android.graphics.Rect; import android.graphics.Region; @@ -1220,6 +1219,8 @@ public final class ViewRoot extends Handler implements ViewParent, if (mTranslator != null) { mTranslator.translateCanvas(canvas); } + canvas.setScreenDensity(scalingRequired + ? DisplayMetrics.DENSITY_DEVICE : 0); mView.draw(canvas); if (Config.DEBUG && ViewDebug.consistencyCheckEnabled) { mView.dispatchConsistencyCheck(ViewDebug.CONSISTENCY_DRAWING); @@ -1328,6 +1329,8 @@ public final class ViewRoot extends Handler implements ViewParent, if (mTranslator != null) { mTranslator.translateCanvas(canvas); } + canvas.setScreenDensity(scalingRequired + ? DisplayMetrics.DENSITY_DEVICE : 0); mView.draw(canvas); } finally { mAttachInfo.mIgnoreDirtyState = false; |