diff options
| author | John Reck <jreck@google.com> | 2011-04-26 16:57:46 -0700 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2011-04-26 17:59:12 -0700 |
| commit | 7818aaa14a04661bdfd7019bdd1904c4383cd40f (patch) | |
| tree | 40b904363ae9bebbc30489446a157dfb1d08db96 /core/java/android/webkit/WebSettings.java | |
| parent | 2d039219adbeaad1a481267bca021b1a8645b481 (diff) | |
Add support for force-enabling zoom
Adds an option in WebSettings that causes WebView to ignore the
user-scalable option on the viewport metatag
Change-Id: Ia850489811a6617a8c17ec6cb17e0a65400f55f0
Diffstat (limited to 'core/java/android/webkit/WebSettings.java')
| -rw-r--r-- | core/java/android/webkit/WebSettings.java | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/core/java/android/webkit/WebSettings.java b/core/java/android/webkit/WebSettings.java index 71d6080287c4..3e11197df764 100644 --- a/core/java/android/webkit/WebSettings.java +++ b/core/java/android/webkit/WebSettings.java @@ -219,6 +219,7 @@ public class WebSettings { private boolean mAllowContentAccess = true; private boolean mLoadWithOverviewMode = false; private boolean mEnableSmoothTransition = false; + private boolean mForceUserScalable = false; // AutoFill Profile data /** @@ -1658,6 +1659,23 @@ public class WebSettings { } } + /** + * Returns whether the viewport metatag can disable zooming + * @hide + */ + public boolean forceUserScalable() { + return mForceUserScalable; + } + + /** + * Sets whether viewport metatag can disable zooming. + * @param flag Whether or not to forceably enable user scalable. + * @hide + */ + public synchronized void setForceUserScalable(boolean flag) { + mForceUserScalable = flag; + } + synchronized void setSyntheticLinksEnabled(boolean flag) { if (mSyntheticLinksEnabled != flag) { mSyntheticLinksEnabled = flag; |
