diff options
| author | Craig Mautner <cmautner@google.com> | 2014-05-09 17:05:11 -0700 |
|---|---|---|
| committer | Craig Mautner <cmautner@google.com> | 2014-05-13 09:51:50 -0700 |
| commit | 233ceeebab7efe6ad4783371003c4cf29b896436 (patch) | |
| tree | 0e342913f30ebd922a3b4313bad0ece303c78e68 /core/java/android/app/IActivityManager.java | |
| parent | e4f1960652a50b99100f7ff68ed461524ca2b9f1 (diff) | |
| download | frameworks_base-233ceeebab7efe6ad4783371003c4cf29b896436.zip frameworks_base-233ceeebab7efe6ad4783371003c4cf29b896436.tar.gz frameworks_base-233ceeebab7efe6ad4783371003c4cf29b896436.tar.bz2 | |
Pass ActivityOptions back from finishing activity.
Adding an ActivityOptions parameter to convertToTranslucent provides
a mechanism for delivering these options to the activity that
launched the one that is returning.
Fixes bug 13032208.
Fixes bug 14469460.
Fixes bug 14597427.
Change-Id: I4115dd3c69de9d175f6df0498a6e964fca5eca29
Diffstat (limited to 'core/java/android/app/IActivityManager.java')
| -rw-r--r-- | core/java/android/app/IActivityManager.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/app/IActivityManager.java b/core/java/android/app/IActivityManager.java index 074b427..254eb39 100644 --- a/core/java/android/app/IActivityManager.java +++ b/core/java/android/app/IActivityManager.java @@ -309,8 +309,9 @@ public interface IActivityManager extends IInterface { public void finishHeavyWeightApp() throws RemoteException; public boolean convertFromTranslucent(IBinder token) throws RemoteException; - public boolean convertToTranslucent(IBinder token) throws RemoteException; + public boolean convertToTranslucent(IBinder token, ActivityOptions options) throws RemoteException; public void notifyActivityDrawn(IBinder token) throws RemoteException; + public ActivityOptions getActivityOptions(IBinder token) throws RemoteException; public void setImmersive(IBinder token, boolean immersive) throws RemoteException; public boolean isImmersive(IBinder token) throws RemoteException; @@ -737,4 +738,5 @@ public interface IActivityManager extends IInterface { int IS_IN_LOCK_TASK_MODE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+216; int SET_RECENTS_ACTIVITY_VALUES_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+217; int START_VOICE_ACTIVITY_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+218; + int GET_ACTIVITY_OPTIONS_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+219; } |