diff options
Diffstat (limited to 'core/java/android/webkit/WebSettings.java')
| -rw-r--r-- | core/java/android/webkit/WebSettings.java | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/core/java/android/webkit/WebSettings.java b/core/java/android/webkit/WebSettings.java index d81d7f2e88fd..122c268b093b 100644 --- a/core/java/android/webkit/WebSettings.java +++ b/core/java/android/webkit/WebSettings.java @@ -178,6 +178,7 @@ public class WebSettings { private boolean mUseDoubleTree = false; private boolean mUseWideViewport = false; private boolean mUseFixedViewport = false; + private int mMaxFixedViewportWidth = WebView.DEFAULT_VIEWPORT_WIDTH; private boolean mSupportMultipleWindows = false; private boolean mShrinksStandaloneImagesToFit = false; private long mMaximumDecodedImageSize = 0; // 0 means default @@ -324,8 +325,9 @@ public class WebSettings { // Detect tablet device for fixed viewport mode. final DisplayMetrics metrics = context.getResources().getDisplayMetrics(); - mUseFixedViewport = (metrics.density == 1.0f - && (metrics.widthPixels >= 800 ||metrics.heightPixels >= 800)); + final int landscapeWidth = Math.max(metrics.widthPixels, metrics.heightPixels); + mUseFixedViewport = (metrics.density == 1.0f && landscapeWidth >= 800); + mMaxFixedViewportWidth = (int) (landscapeWidth * 1.25); if (sLockForLocaleSettings == null) { sLockForLocaleSettings = new Object(); @@ -1516,6 +1518,13 @@ public class WebSettings { } /** + * Returns maximum fixed viewport width. + */ + /* package */ int getMaxFixedViewportWidth() { + return mMaxFixedViewportWidth; + } + + /** * Returns whether private browsing is enabled. */ /* package */ boolean isPrivateBrowsingEnabled() { |