diff options
| author | George Mount <mount@google.com> | 2015-04-08 14:48:02 -0700 |
|---|---|---|
| committer | George Mount <mount@google.com> | 2015-04-08 14:48:02 -0700 |
| commit | bd93e69c8e0b06fc0b0bbba4bdd9e426b37f98e1 (patch) | |
| tree | eb4966d605602c4d3291ed763fa91d387641ef90 /api | |
| parent | ec3c97d27f2a424fa847561a3932a40c093a91a1 (diff) | |
| download | frameworks_base-bd93e69c8e0b06fc0b0bbba4bdd9e426b37f98e1.zip frameworks_base-bd93e69c8e0b06fc0b0bbba4bdd9e426b37f98e1.tar.gz frameworks_base-bd93e69c8e0b06fc0b0bbba4bdd9e426b37f98e1.tar.bz2 | |
Allow delay of showing/hiding shared element when transferring.
Bug 18932344
Change-Id: Ic967551a4dd27967d2312a6c6c8a83b34c220031
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 5 | ||||
| -rw-r--r-- | api/system-current.txt | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 1e57d19..5e81c39 100644 --- a/api/current.txt +++ b/api/current.txt @@ -5310,6 +5310,11 @@ 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 544cbb3..1b07b1d 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -5401,6 +5401,11 @@ 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 { |