diff options
| author | George Mount <mount@google.com> | 2015-04-09 18:14:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-09 18:14:02 +0000 |
| commit | 99789402081abe757a800311813d8f3bbd39e6b8 (patch) | |
| tree | 05c5bcf2525cdcf8f4d1872d7a91de581a18cf96 /api | |
| parent | 341d932af183ed8ace6ba5474aa6f454eb807e00 (diff) | |
| parent | 44d15f1c2e8f07ae9a88d79721547cf8e5935b6c (diff) | |
| download | frameworks_base-99789402081abe757a800311813d8f3bbd39e6b8.zip frameworks_base-99789402081abe757a800311813d8f3bbd39e6b8.tar.gz frameworks_base-99789402081abe757a800311813d8f3bbd39e6b8.tar.bz2 | |
Merge "Revert "Allow delay of showing/hiding shared element when transferring.""
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 5 | ||||
| -rw-r--r-- | api/system-current.txt | 5 |
2 files changed, 0 insertions, 10 deletions
diff --git a/api/current.txt b/api/current.txt index d3ae427..0c319d2 100644 --- a/api/current.txt +++ b/api/current.txt @@ -5317,11 +5317,6 @@ package android.app { method public void onRejectSharedElements(java.util.List<android.view.View>); method public void onSharedElementEnd(java.util.List<java.lang.String>, java.util.List<android.view.View>, java.util.List<android.view.View>); method public void onSharedElementStart(java.util.List<java.lang.String>, java.util.List<android.view.View>, java.util.List<android.view.View>); - method public void onSharedElementsArrived(java.util.List<java.lang.String>, java.util.List<android.view.View>, android.app.SharedElementCallback.OnSharedElementsReadyListener); - } - - public static abstract interface SharedElementCallback.OnSharedElementsReadyListener { - method public abstract void onSharedElementsReady(); } public deprecated class TabActivity extends android.app.ActivityGroup { diff --git a/api/system-current.txt b/api/system-current.txt index 431809e..18ccc77 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -5408,11 +5408,6 @@ package android.app { method public void onRejectSharedElements(java.util.List<android.view.View>); method public void onSharedElementEnd(java.util.List<java.lang.String>, java.util.List<android.view.View>, java.util.List<android.view.View>); method public void onSharedElementStart(java.util.List<java.lang.String>, java.util.List<android.view.View>, java.util.List<android.view.View>); - method public void onSharedElementsArrived(java.util.List<java.lang.String>, java.util.List<android.view.View>, android.app.SharedElementCallback.OnSharedElementsReadyListener); - } - - public static abstract interface SharedElementCallback.OnSharedElementsReadyListener { - method public abstract void onSharedElementsReady(); } public deprecated class TabActivity extends android.app.ActivityGroup { |