diff options
| author | Grace Kloba <klobag@google.com> | 2009-11-11 20:15:02 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-11 20:15:02 -0800 |
| commit | 4888c7da45b356bfcff5a6564150ca95a0a0afcf (patch) | |
| tree | ea1bfdc438a0451e66d5b99bec24040037b9138a /core/java/android/webkit | |
| parent | 207d00c13c02d301ff4ec302b1ee8cd7c256a4a5 (diff) | |
| parent | dc30d28bc8321171fbf4ed92a9486eb8dd382259 (diff) | |
| download | frameworks_base-4888c7da45b356bfcff5a6564150ca95a0a0afcf.zip frameworks_base-4888c7da45b356bfcff5a6564150ca95a0a0afcf.tar.gz frameworks_base-4888c7da45b356bfcff5a6564150ca95a0a0afcf.tar.bz2 | |
am dc30d28b: Merge change I3656f7a3 into eclair
Merge commit 'dc30d28bc8321171fbf4ed92a9486eb8dd382259' into eclair-mr2
* commit 'dc30d28bc8321171fbf4ed92a9486eb8dd382259':
Honor the mInitialScale set on WebView. This was
Diffstat (limited to 'core/java/android/webkit')
| -rw-r--r-- | core/java/android/webkit/WebView.java | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 9d5cedd..4b5f94b 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -513,7 +513,7 @@ public class WebView extends AbsoluteLayout private boolean mMinZoomScaleFixed = true; // initial scale in percent. 0 means using default. - private int mInitialScale = 0; + private int mInitialScaleInPercent = 0; // while in the zoom overview mode, the page's width is fully fit to the // current window. The page is alive, in another words, you can click to @@ -1607,7 +1607,7 @@ public class WebView extends AbsoluteLayout * @param scaleInPercent The initial scale in percent. */ public void setInitialScale(int scaleInPercent) { - mInitialScale = scaleInPercent; + mInitialScaleInPercent = scaleInPercent; } /** @@ -3745,6 +3745,13 @@ public class WebView extends AbsoluteLayout mMinZoomScale = Math.min(1.0f, (float) getViewWidth() / (mDrawHistory ? mHistoryPicture.getWidth() : mZoomOverviewWidth)); + if (mInitialScaleInPercent > 0) { + // limit the minZoomScale to the initialScale if it is set + float initialScale = mInitialScaleInPercent / 100.0f; + if (mMinZoomScale > initialScale) { + mMinZoomScale = initialScale; + } + } } // we always force, in case our height changed, in which case we still @@ -5099,7 +5106,9 @@ public class WebView extends AbsoluteLayout WebViewCore.RestoreState restoreState = draw.mRestoreState; if (restoreState != null) { mInZoomOverview = false; - mLastScale = restoreState.mTextWrapScale; + mLastScale = mInitialScaleInPercent > 0 + ? mInitialScaleInPercent / 100.0f + : restoreState.mTextWrapScale; if (restoreState.mMinScale == 0) { if (restoreState.mMobileSite) { if (draw.mMinPrefWidth > |