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 /api | |
| 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 'api')
| -rw-r--r-- | api/current.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/api/current.txt b/api/current.txt index f33c6cb..dd3efd1 100644 --- a/api/current.txt +++ b/api/current.txt @@ -25145,7 +25145,7 @@ package android.webkit { method public synchronized java.lang.String getFixedFontFamily(); method public synchronized boolean getJavaScriptCanOpenWindowsAutomatically(); method public synchronized boolean getJavaScriptEnabled(); - method public deprecated synchronized android.webkit.WebSettings.LayoutAlgorithm getLayoutAlgorithm(); + method public synchronized android.webkit.WebSettings.LayoutAlgorithm getLayoutAlgorithm(); method public boolean getLightTouchEnabled(); method public boolean getLoadWithOverviewMode(); method public synchronized boolean getLoadsImagesAutomatically(); @@ -25192,7 +25192,7 @@ package android.webkit { method public synchronized void setGeolocationEnabled(boolean); method public synchronized void setJavaScriptCanOpenWindowsAutomatically(boolean); method public synchronized void setJavaScriptEnabled(boolean); - method public deprecated synchronized void setLayoutAlgorithm(android.webkit.WebSettings.LayoutAlgorithm); + method public synchronized void setLayoutAlgorithm(android.webkit.WebSettings.LayoutAlgorithm); method public void setLightTouchEnabled(boolean); method public void setLoadWithOverviewMode(boolean); method public synchronized void setLoadsImagesAutomatically(boolean); @@ -25227,12 +25227,12 @@ package android.webkit { field public static final int LOAD_NO_CACHE = 2; // 0x2 } - public static final deprecated class WebSettings.LayoutAlgorithm extends java.lang.Enum { + public static final class WebSettings.LayoutAlgorithm extends java.lang.Enum { method public static android.webkit.WebSettings.LayoutAlgorithm valueOf(java.lang.String); method public static final android.webkit.WebSettings.LayoutAlgorithm[] values(); enum_constant public static final android.webkit.WebSettings.LayoutAlgorithm NARROW_COLUMNS; enum_constant public static final android.webkit.WebSettings.LayoutAlgorithm NORMAL; - enum_constant public static final android.webkit.WebSettings.LayoutAlgorithm SINGLE_COLUMN; + enum_constant public static final deprecated android.webkit.WebSettings.LayoutAlgorithm SINGLE_COLUMN; } public static final class WebSettings.PluginState extends java.lang.Enum { |