diff options
| -rw-r--r-- | core/java/android/webkit/WebSettings.java | 10 | ||||
| -rw-r--r-- | core/java/android/webkit/WebSettingsClassic.java | 4 |
2 files changed, 13 insertions, 1 deletions
diff --git a/core/java/android/webkit/WebSettings.java b/core/java/android/webkit/WebSettings.java index 83f799045907..3203eb045d6f 100644 --- a/core/java/android/webkit/WebSettings.java +++ b/core/java/android/webkit/WebSettings.java @@ -37,6 +37,10 @@ public abstract class WebSettings { * <li>SINGLE_COLUMN moves all content into one column that is the width of the * view.</li> * <li>NARROW_COLUMNS makes all columns no wider than the screen if possible.</li> + * <li>TEXT_AUTOSIZING boosts font size of paragraphs based on heuristics to make + * the text readable when viewing a wide-viewport layout in the overview mode. + * It is recommended to enable zoom support {@link #setSupportZoom} when + * using this mode.</li> * </ul> */ // XXX: These must match LayoutAlgorithm in Settings.h in WebCore. @@ -47,7 +51,11 @@ public abstract class WebSettings { */ @Deprecated SINGLE_COLUMN, - NARROW_COLUMNS + NARROW_COLUMNS, + /** + * @hide + */ + TEXT_AUTOSIZING } /** diff --git a/core/java/android/webkit/WebSettingsClassic.java b/core/java/android/webkit/WebSettingsClassic.java index e3d095f367b4..c10a429e11d2 100644 --- a/core/java/android/webkit/WebSettingsClassic.java +++ b/core/java/android/webkit/WebSettingsClassic.java @@ -816,6 +816,10 @@ public class WebSettingsClassic extends WebSettings { */ @Override public synchronized void setLayoutAlgorithm(LayoutAlgorithm l) { + if (l == LayoutAlgorithm.TEXT_AUTOSIZING) { + throw new IllegalArgumentException( + "WebViewClassic does not support TEXT_AUTOSIZING layout mode"); + } // XXX: This will only be affective if libwebcore was built with // ANDROID_LAYOUT defined. if (mLayoutAlgorithm != l) { |