diff options
| author | Adam Powell <adamp@google.com> | 2014-05-10 01:55:07 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-10 01:55:07 +0000 |
| commit | 7e53b6389a531d49bcd418a53febdb2e7ef0bb30 (patch) | |
| tree | 9f7183591e029b328d4a2a4756a43ffcfe39724f /api | |
| parent | 0a2fc1537084076234dcc370725d2dfc81b23792 (diff) | |
| parent | 17048b84ec10e406da3d25f966b69f91871da5f8 (diff) | |
| download | frameworks_base-7e53b6389a531d49bcd418a53febdb2e7ef0bb30.zip frameworks_base-7e53b6389a531d49bcd418a53febdb2e7ef0bb30.tar.gz frameworks_base-7e53b6389a531d49bcd418a53febdb2e7ef0bb30.tar.bz2 | |
am faf2e7ff: Merge "Revert "Remove the View#initializeScrollbars API""
* commit 'faf2e7ffa99643144db4a3857e002e6ad31be355':
Revert "Remove the View#initializeScrollbars API"
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/removed.txt | 8 |
2 files changed, 1 insertions, 8 deletions
diff --git a/api/current.txt b/api/current.txt index 629781e..37a17d7 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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(); 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); - } - -} - |