diff options
| author | John Reck <jreck@google.com> | 2011-11-17 08:49:49 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-17 08:49:49 -0800 |
| commit | 2c6afef8766371bf933f8675c80687802ce045e0 (patch) | |
| tree | ad882924ff4ffa070b517868f3b59615a7e95bf8 /core | |
| parent | e6269f7988a2ec0d1f9ea37d92d6b0ca2f3dc3b8 (diff) | |
| parent | 1da3d656358ab577f285d06e9db249dfb21cb8e3 (diff) | |
| download | frameworks_base-2c6afef8766371bf933f8675c80687802ce045e0.zip frameworks_base-2c6afef8766371bf933f8675c80687802ce045e0.tar.gz frameworks_base-2c6afef8766371bf933f8675c80687802ce045e0.tar.bz2 | |
am 1da3d656: Merge "Undeprecate LayoutAlgorithm" into ics-mr1
* commit '1da3d656358ab577f285d06e9db249dfb21cb8e3':
Undeprecate LayoutAlgorithm
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/webkit/WebSettings.java | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/core/java/android/webkit/WebSettings.java b/core/java/android/webkit/WebSettings.java index 0c3f94e..f947f95 100644 --- a/core/java/android/webkit/WebSettings.java +++ b/core/java/android/webkit/WebSettings.java @@ -42,12 +42,14 @@ public class WebSettings { * SINGLE_COLUMN moves all content into one column that is the width of the * view. * NARROW_COLUMNS makes all columns no wider than the screen if possible. - * @deprecated This enum is now obsolete. */ // XXX: These must match LayoutAlgorithm in Settings.h in WebCore. - @Deprecated public enum LayoutAlgorithm { NORMAL, + /** + * @deprecated This algorithm is now obsolete. + */ + @Deprecated SINGLE_COLUMN, NARROW_COLUMNS } @@ -936,9 +938,7 @@ public class WebSettings { * WebView. * @param l A LayoutAlgorithm enum specifying the algorithm to use. * @see WebSettings.LayoutAlgorithm - * @deprecated This method is now obsolete. */ - @Deprecated public synchronized void setLayoutAlgorithm(LayoutAlgorithm l) { // XXX: This will only be affective if libwebcore was built with // ANDROID_LAYOUT defined. @@ -953,9 +953,7 @@ public class WebSettings { * @return LayoutAlgorithm enum value describing the layout algorithm * being used. * @see WebSettings.LayoutAlgorithm - * @deprecated This method is now obsolete. */ - @Deprecated public synchronized LayoutAlgorithm getLayoutAlgorithm() { return mLayoutAlgorithm; } |