Merge "Revert "Remove the View#initializeScrollbars API""
diff --git a/api/current.txt b/api/current.txt
index 8db1cf4..89261b2 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -31300,6 +31300,7 @@
method public boolean hasWindowFocus();
method public static android.view.View inflate(android.content.Context, int, android.view.ViewGroup);
method protected void initializeFadingEdge(android.content.res.TypedArray);
+ method protected void initializeScrollbars(android.content.res.TypedArray);
method public void invalidate(android.graphics.Rect);
method public void invalidate(int, int, int, int);
method public void invalidate();
diff --git a/api/removed.txt b/api/removed.txt
index 8c19d04..e69de29 100644
--- a/api/removed.txt
+++ b/api/removed.txt
@@ -1,8 +0,0 @@
-package android.view {
-
- public class View implements android.view.accessibility.AccessibilityEventSource android.graphics.drawable.Drawable.Callback android.view.KeyEvent.Callback {
- method protected void initializeScrollbars(android.content.res.TypedArray);
- }
-
-}
-
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 3dcc512..bef96b1 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -4319,9 +4319,6 @@
* </p>
*
* @param a the styled attributes set to initialize the scrollbars from
- *
- * @removed Apps were never able to call this safely since the TypedArray parameter
- * must have been obtained by filtering on android.R.styleable.View, which is not public.
*/
protected void initializeScrollbars(TypedArray a) {
initScrollCache();