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

am 7633540c: Merge "Keep min/max zoom scale in proportion when zoom density changes." into honeycomb

Browse Source 
* commit '7633540cf0d1cfa1f893dc827cddaca3ea272af7':
  Keep min/max zoom scale in proportion when zoom density changes.
This commit is contained in:
Shimeng (Simon) Wang
2011-01-21 10:47:35 -08:00
committed by Android Git Automerger
parent 174a6fce8a 7633540cf0
commit a2d32f3c48
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/java/android/webkit/ZoomManager.java
View File

@@ -232,12 +232,26 @@ class ZoomManager {
}
private void setDefaultZoomScale(float defaultScale) {
final float originalDefault = mDefaultScale;
mDefaultScale = defaultScale;
mInvDefaultScale = 1 / defaultScale;
mDefaultMaxZoomScale = defaultScale * DEFAULT_MAX_ZOOM_SCALE_FACTOR;
mDefaultMinZoomScale = defaultScale * DEFAULT_MIN_ZOOM_SCALE_FACTOR;
mMaxZoomScale = mDefaultMaxZoomScale;
mMinZoomScale = mDefaultMinZoomScale;
if (originalDefault > 0.0 && mMaxZoomScale > 0.0) {
// Keeps max zoom scale when zoom density changes.
mMaxZoomScale = defaultScale / originalDefault * mMaxZoomScale;
} else {
mMaxZoomScale = mDefaultMaxZoomScale;
}
if (originalDefault > 0.0 && mMinZoomScale > 0.0) {
// Keeps min zoom scale when zoom density changes.
mMinZoomScale = defaultScale / originalDefault * mMinZoomScale;
} else {
mMinZoomScale = mDefaultMinZoomScale;
}
if (!exceedsMinScaleIncrement(mMinZoomScale, mMaxZoomScale)) {
mMaxZoomScale = mMinZoomScale;
}
}
public final float getScale() {
@@ -468,7 +482,7 @@ class ZoomManager {
mTextWrapScale = scale;
}
if (scale != mActualScale || force) {
if (exceedsMinScaleIncrement(scale, mActualScale) || force) {
float oldScale = mActualScale;
float oldInvScale = mInvActualScale;