Enable new open app transitions when in multiwindow mode.

Bug: 79118278
Change-Id: Iba79948256d70c913af0a9a584eb040f3a8b4151
This commit is contained in:
Jon Miranda
2018-05-16 18:06:23 -07:00
parent 98913d0c95
commit 73c27ec176
7 changed files with 61 additions and 44 deletions

View File

@@ -141,13 +141,12 @@ public abstract class BaseDraggingActivity extends BaseActivity
return new Rect(pos[0], pos[1], pos[0] + v.getWidth(), pos[1] + v.getHeight());
}
public final Bundle getActivityLaunchOptionsAsBundle(View v, boolean useDefaultLaunchOptions) {
ActivityOptions activityOptions = getActivityLaunchOptions(v, useDefaultLaunchOptions);
public final Bundle getActivityLaunchOptionsAsBundle(View v) {
ActivityOptions activityOptions = getActivityLaunchOptions(v);
return activityOptions == null ? null : activityOptions.toBundle();
}
public abstract ActivityOptions getActivityLaunchOptions(
View v, boolean useDefaultLaunchOptions);
public abstract ActivityOptions getActivityLaunchOptions(View v);
public boolean startActivitySafely(View v, Intent intent, ItemInfo item) {
if (mIsSafeModeEnabled && !Utilities.isSystemApp(this, intent)) {
@@ -160,7 +159,7 @@ public abstract class BaseDraggingActivity extends BaseActivity
boolean useLaunchAnimation = (v != null) &&
!intent.hasExtra(INTENT_EXTRA_IGNORE_LAUNCH_ANIMATION);
Bundle optsBundle = useLaunchAnimation
? getActivityLaunchOptionsAsBundle(v, isInMultiWindowModeCompat())
? getActivityLaunchOptionsAsBundle(v)
: null;
UserHandle user = item == null ? null : item.user;