diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2018-01-25 15:21:54 +0100 |
|---|---|---|
| committer | Jorim Jaggi <jjaggi@google.com> | 2018-01-25 15:21:54 +0100 |
| commit | 9f8518e532e41ba57916afc49bba72bc23ad3eda (patch) | |
| tree | e776c929e4a90b9785691f23f590a9743c36ea35 /core/java/android/app/ActivityOptions.java | |
| parent | 86733be8f65ddc01a0dc7f821fedbd852eabcb39 (diff) | |
Revert "2/ Add support for remote Recents animation"
This reverts commit 0026a5152c427f9cf2c04da2b23a5ece2fcdb36d.
Breaks presubmits
Diffstat (limited to 'core/java/android/app/ActivityOptions.java')
| -rw-r--r-- | core/java/android/app/ActivityOptions.java | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/core/java/android/app/ActivityOptions.java b/core/java/android/app/ActivityOptions.java index fee58274a5fc..4bcd677e1f4e 100644 --- a/core/java/android/app/ActivityOptions.java +++ b/core/java/android/app/ActivityOptions.java @@ -207,12 +207,6 @@ public class ActivityOptions { "android.activity.taskOverlayCanResume"; /** - * See {@link #setAvoidMoveToFront()}. - * @hide - */ - private static final String KEY_AVOID_MOVE_TO_FRONT = "android.activity.avoidMoveToFront"; - - /** * Where the split-screen-primary stack should be positioned. * @hide */ @@ -313,7 +307,6 @@ public class ActivityOptions { private boolean mDisallowEnterPictureInPictureWhileLaunching; private boolean mTaskOverlay; private boolean mTaskOverlayCanResume; - private boolean mAvoidMoveToFront; private AppTransitionAnimationSpec mAnimSpecs[]; private int mRotationAnimationHint = -1; private Bundle mAppVerificationBundle; @@ -930,7 +923,6 @@ public class ActivityOptions { mLaunchTaskId = opts.getInt(KEY_LAUNCH_TASK_ID, -1); mTaskOverlay = opts.getBoolean(KEY_TASK_OVERLAY, false); mTaskOverlayCanResume = opts.getBoolean(KEY_TASK_OVERLAY_CAN_RESUME, false); - mAvoidMoveToFront = opts.getBoolean(KEY_AVOID_MOVE_TO_FRONT, false); mSplitScreenCreateMode = opts.getInt(KEY_SPLIT_SCREEN_CREATE_MODE, SPLIT_SCREEN_CREATE_MODE_TOP_OR_LEFT); mDisallowEnterPictureInPictureWhileLaunching = opts.getBoolean( @@ -1247,25 +1239,6 @@ public class ActivityOptions { return mTaskOverlayCanResume; } - /** - * Sets whether the activity launched should not cause the activity stack it is contained in to - * be moved to the front as a part of launching. - * - * @hide - */ - public void setAvoidMoveToFront() { - mAvoidMoveToFront = true; - } - - /** - * @return whether the activity launch should prevent moving the associated activity stack to - * the front. - * @hide - */ - public boolean getAvoidMoveToFront() { - return mAvoidMoveToFront; - } - /** @hide */ public int getSplitScreenCreateMode() { return mSplitScreenCreateMode; @@ -1443,7 +1416,6 @@ public class ActivityOptions { b.putInt(KEY_LAUNCH_TASK_ID, mLaunchTaskId); b.putBoolean(KEY_TASK_OVERLAY, mTaskOverlay); b.putBoolean(KEY_TASK_OVERLAY_CAN_RESUME, mTaskOverlayCanResume); - b.putBoolean(KEY_AVOID_MOVE_TO_FRONT, mAvoidMoveToFront); b.putInt(KEY_SPLIT_SCREEN_CREATE_MODE, mSplitScreenCreateMode); b.putBoolean(KEY_DISALLOW_ENTER_PICTURE_IN_PICTURE_WHILE_LAUNCHING, mDisallowEnterPictureInPictureWhileLaunching); |
