Merge change 5417 into donut
* changes:
Fixes #1943309. RelativeLayout was confused by gravities.
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 @@
// 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;
}