diff options
| author | Adam Powell <adamp@google.com> | 2014-05-11 22:42:23 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-11 22:42:23 +0000 |
| commit | 6fe526b980628ae1e07e5dd276552d1c04e7730d (patch) | |
| tree | 901a0534ff6719e940fd63eb9733c7ab8d85cd91 /api | |
| parent | af2abd906b65aa5324ca2ddc68ef3765d41bffc0 (diff) | |
| parent | 5fca50490746c52c2ec977529af3bbf17ce3b285 (diff) | |
| download | frameworks_base-6fe526b980628ae1e07e5dd276552d1c04e7730d.zip frameworks_base-6fe526b980628ae1e07e5dd276552d1c04e7730d.tar.gz frameworks_base-6fe526b980628ae1e07e5dd276552d1c04e7730d.tar.bz2 | |
am 7b7d5e43: Merge "New, inkier EdgeEffect visual style"
* commit '7b7d5e4347ca9f7cddbec07cea752756f8c1ac47':
New, inkier EdgeEffect visual style
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 49f84d3..ce0744d 100644 --- a/api/current.txt +++ b/api/current.txt @@ -35175,9 +35175,11 @@ package android.widget { ctor public EdgeEffect(android.content.Context); method public boolean draw(android.graphics.Canvas); method public void finish(); + method public int getMaxHeight(); method public boolean isFinished(); method public void onAbsorb(int); method public void onPull(float); + method public void onPull(float, float); method public void onRelease(); method public void setSize(int, int); } |