diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-25 14:44:38 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-25 14:44:38 -0700 |
| commit | 157601594fc7139a45ec43a860d36ee0045d0333 (patch) | |
| tree | 0d740863795d703e427bf4c94ab15124fb0bb962 /core/java/android/webkit | |
| parent | eb3ec64a6a962aa48a46753c6e69ce24f889a4cc (diff) | |
| parent | 2b2e9d91521a9f271d8661d4254c4e154e3c0223 (diff) | |
| download | frameworks_base-157601594fc7139a45ec43a860d36ee0045d0333.zip frameworks_base-157601594fc7139a45ec43a860d36ee0045d0333.tar.gz frameworks_base-157601594fc7139a45ec43a860d36ee0045d0333.tar.bz2 | |
Merge change 5413 into donut
* changes:
Need to write the correct float math.
Diffstat (limited to 'core/java/android/webkit')
| -rw-r--r-- | core/java/android/webkit/WebViewCore.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/webkit/WebViewCore.java b/core/java/android/webkit/WebViewCore.java index e9b2fc0..a5fa41e 100644 --- a/core/java/android/webkit/WebViewCore.java +++ b/core/java/android/webkit/WebViewCore.java @@ -1562,7 +1562,7 @@ final class WebViewCore { // adjust the default scale to match the density if (WebView.DEFAULT_SCALE_PERCENT != 100) { - float adjust = WebView.DEFAULT_SCALE_PERCENT / 100; + float adjust = (float) WebView.DEFAULT_SCALE_PERCENT / 100.0f; if (mViewportInitialScale > 0) { mViewportInitialScale *= adjust; } |