Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 4d69ac66: Merge "DO NOT MERGE" into eclair

Browse Source 
Merge commit '4d69ac6695246b8df06a6583044dc4712d81a956' into eclair-plus-aosp

* commit '4d69ac6695246b8df06a6583044dc4712d81a956':
  DO NOT MERGE
This commit is contained in:
Grace Kloba
2010-01-14 19:32:45 -08:00
committed by Android Git Automerger
parent c8cab72521 4d69ac6695
commit 88196464e9
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/webkit/WebView.java
View File

@@ -5206,7 +5206,8 @@ public class WebView extends AbsoluteLayout
if (Math.abs((viewWidth * mInvActualScale) if (Math.abs((viewWidth * mInvActualScale)
- mZoomOverviewWidth) > 1) { - mZoomOverviewWidth) > 1) {
setNewZoomScale((float) viewWidth setNewZoomScale((float) viewWidth
/ mZoomOverviewWidth, true, false); / mZoomOverviewWidth, Math.abs(mActualScale
- mTextWrapScale) < 0.01f, false);
} }
} }
break; break;