am faf2e7ff: Merge "Revert "Remove the View#initializeScrollbars API""

* commit 'faf2e7ffa99643144db4a3857e002e6ad31be355':
  Revert "Remove the View#initializeScrollbars API"
This commit is contained in:
Adam Powell
2014-05-10 01:55:07 +00:00
committed by Android Git Automerger
3 changed files with 1 additions and 11 deletions

View File

@@ -31589,6 +31589,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();

View File

@@ -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);
}
}

View File

@@ -4319,9 +4319,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
* </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();