summaryrefslogtreecommitdiff
path: root/core/java/android/app/IApplicationThread.java
diff options
context:
space:
mode:
authorCraig Mautner <cmautner@google.com>2014-07-02 15:04:09 -0700
committerGeorge Mount <mount@google.com>2014-07-07 12:48:50 -0700
commiteb8abf7207aa118065999514f9248affbdd94de1 (patch)
tree692d600948fdc214b59eb042b4802459a05f163b /core/java/android/app/IApplicationThread.java
parentd1ed9b3ea74870fae3e666b4a3b26d8281999d8a (diff)
Introduce onNewActivityOptions for return activity
When an activity that is already translucent returns to the previous activity using a scene transition the receiving activity did not receive its ActivityOptions for its side of the animation. The new method onNewActivityOptions() delivers those options. Fixes bug 14869070. Change-Id: I09b136b3213aae5d3521894e17a7500ac793f3d2
Diffstat (limited to 'core/java/android/app/IApplicationThread.java')
-rw-r--r--core/java/android/app/IApplicationThread.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/app/IApplicationThread.java b/core/java/android/app/IApplicationThread.java
index d0df7c340238..d3c485484cde 100644
--- a/core/java/android/app/IApplicationThread.java
+++ b/core/java/android/app/IApplicationThread.java
@@ -140,6 +140,8 @@ public interface IApplicationThread extends IInterface {
throws RemoteException;
void scheduleTranslucentConversionComplete(IBinder token, boolean timeout)
throws RemoteException;
+ void scheduleOnNewActivityOptions(IBinder token, ActivityOptions options)
+ throws RemoteException;
void setProcessState(int state) throws RemoteException;
void scheduleInstallProvider(ProviderInfo provider) throws RemoteException;
void updateTimePrefs(boolean is24Hour) throws RemoteException;
@@ -176,7 +178,7 @@ public interface IApplicationThread extends IInterface {
int SET_SCHEDULING_GROUP_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+28;
int SCHEDULE_CREATE_BACKUP_AGENT_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+29;
int SCHEDULE_DESTROY_BACKUP_AGENT_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+30;
-
+ int SCHEDULE_ON_NEW_ACTIVITY_OPTIONS_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+31;
int SCHEDULE_SUICIDE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+32;
int DISPATCH_PACKAGE_BROADCAST_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+33;
int SCHEDULE_CRASH_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+34;