From d20aa6c5315b817f053a84f86e5c3e44049399d7 Mon Sep 17 00:00:00 2001 From: Adam Powell Date: Sat, 10 May 2014 01:51:27 +0000 Subject: [PATCH] Revert "Remove the View#initializeScrollbars API" Looks like there are some bugs in the API checker for @removed. This reverts commit 172c26e20fd71a2b4489a80b96ea5f6292db6430. Change-Id: Ia4e610f71af19c5521fc019b9a6c26d0c11f23f1 --- api/current.txt | 1 + api/removed.txt | 8 -------- core/java/android/view/View.java | 3 --- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/api/current.txt b/api/current.txt index 3612698f679c0..1c9f871c30e4d 100644 --- a/api/current.txt +++ b/api/current.txt @@ -30569,6 +30569,7 @@ package android.view { 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 8c19d043f0388..e69de29bb2d1d 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 e1ac8c99608d1..d8fcfc516bf53 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -4307,9 +4307,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback, *

* * @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();