diff options
author | John Reck <jreck@google.com> | 2011-10-26 10:37:00 -0700 |
---|---|---|
committer | John Reck <jreck@google.com> | 2011-11-16 11:08:44 -0800 |
commit | 5a1ef4132f93f57940a5cc49d32991674d014841 (patch) | |
tree | 4975941562586b7027034d9feae2f5462139e1ba /core/java/android/webkit/WebSettings.java | |
parent | c7403258528a08ab74f7c29277d0c34ba6edc53d (diff) | |
download | frameworks_base-5a1ef4132f93f57940a5cc49d32991674d014841.zip frameworks_base-5a1ef4132f93f57940a5cc49d32991674d014841.tar.gz frameworks_base-5a1ef4132f93f57940a5cc49d32991674d014841.tar.bz2 |
Undeprecate LayoutAlgorithm
Bug: 5533078
There is no alternative and this is still useful and used. It should
not have been deprecated.
Change-Id: I641026cf76ea87738909827b7c48a556d9021d11
Diffstat (limited to 'core/java/android/webkit/WebSettings.java')
-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 f240a2e..a6c7d2f 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; } |