diff options
| author | Paul Miller <paulmiller@google.com> | 2015-06-09 21:00:30 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-09 21:00:32 +0000 |
| commit | 87a19e25fe736a0fe92a0b4e8490136350519393 (patch) | |
| tree | 7c2b7646394328faff2a5eb6fcf67de871f09db5 /core/java | |
| parent | 62974816a325fa6ea49d6f9800b962af85a9856a (diff) | |
| parent | c8694a082ab4870d9f148ac98a5e1b3b07d75cc0 (diff) | |
| download | frameworks_base-87a19e25fe736a0fe92a0b4e8490136350519393.zip frameworks_base-87a19e25fe736a0fe92a0b4e8490136350519393.tar.gz frameworks_base-87a19e25fe736a0fe92a0b4e8490136350519393.tar.bz2 | |
Merge "Deprecate WebView scrollbar overlay API" into mnc-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/webkit/WebView.java | 24 | ||||
| -rw-r--r-- | core/java/android/webkit/WebViewProvider.java | 4 |
2 files changed, 18 insertions, 10 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 5080fcc..aa72eb3 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -611,41 +611,45 @@ public class WebView extends AbsoluteLayout /** * Specifies whether the horizontal scrollbar has overlay style. * + * @deprecated This method has no effect. * @param overlay true if horizontal scrollbar should have overlay style */ + @Deprecated public void setHorizontalScrollbarOverlay(boolean overlay) { - checkThread(); - mProvider.setHorizontalScrollbarOverlay(overlay); } /** * Specifies whether the vertical scrollbar has overlay style. * + * @deprecated This method has no effect. * @param overlay true if vertical scrollbar should have overlay style */ + @Deprecated public void setVerticalScrollbarOverlay(boolean overlay) { - checkThread(); - mProvider.setVerticalScrollbarOverlay(overlay); } /** * Gets whether horizontal scrollbar has overlay style. * - * @return true if horizontal scrollbar has overlay style + * @deprecated This method is now obsolete. + * @return true */ + @Deprecated public boolean overlayHorizontalScrollbar() { - checkThread(); - return mProvider.overlayHorizontalScrollbar(); + // The old implementation defaulted to true, so return true for consistency + return true; } /** * Gets whether vertical scrollbar has overlay style. * - * @return true if vertical scrollbar has overlay style + * @deprecated This method is now obsolete. + * @return false */ + @Deprecated public boolean overlayVerticalScrollbar() { - checkThread(); - return mProvider.overlayVerticalScrollbar(); + // The old implementation defaulted to false, so return false for consistency + return false; } /** diff --git a/core/java/android/webkit/WebViewProvider.java b/core/java/android/webkit/WebViewProvider.java index 09afcf1..27033ad 100644 --- a/core/java/android/webkit/WebViewProvider.java +++ b/core/java/android/webkit/WebViewProvider.java @@ -70,12 +70,16 @@ public interface WebViewProvider { public void init(Map<String, Object> javaScriptInterfaces, boolean privateBrowsing); + // Deprecated - should never be called public void setHorizontalScrollbarOverlay(boolean overlay); + // Deprecated - should never be called public void setVerticalScrollbarOverlay(boolean overlay); + // Deprecated - should never be called public boolean overlayHorizontalScrollbar(); + // Deprecated - should never be called public boolean overlayVerticalScrollbar(); public int getVisibleTitleHeight(); |