diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-19 21:14:48 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-07-19 21:14:48 -0700 |
| commit | bec99bffeecacb1af603966391014895f9a16025 (patch) | |
| tree | 698db3ee01626f7e4f8db3ba3dce56f44aa45d74 /api | |
| parent | 79b7c68d5a1979a67d1d5ec6b9229aaab79cad3e (diff) | |
| parent | 5c536e9162721c460699a041959a0d67de1d20db (diff) | |
| download | frameworks_base-bec99bffeecacb1af603966391014895f9a16025.zip frameworks_base-bec99bffeecacb1af603966391014895f9a16025.tar.gz frameworks_base-bec99bffeecacb1af603966391014895f9a16025.tar.bz2 | |
am 5c536e91: Merge change 7840 into donut
Merge commit '5c536e9162721c460699a041959a0d67de1d20db'
* commit '5c536e9162721c460699a041959a0d67de1d20db':
Fix issue where scaled bitmap sizes could be wrong.
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.xml | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/api/current.xml b/api/current.xml index c796a2a..3e3a855 100644 --- a/api/current.xml +++ b/api/current.xml @@ -52783,6 +52783,21 @@ deprecated="not deprecated" visibility="public" > +<parameter name="canvas" type="android.graphics.Canvas"> +</parameter> +</method> +<method name="getScaledHeight" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="metrics" type="android.util.DisplayMetrics"> +</parameter> </method> <method name="getScaledWidth" return="int" @@ -52794,6 +52809,21 @@ deprecated="not deprecated" visibility="public" > +<parameter name="canvas" type="android.graphics.Canvas"> +</parameter> +</method> +<method name="getScaledWidth" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="metrics" type="android.util.DisplayMetrics"> +</parameter> </method> <method name="getWidth" return="int" |