diff --git a/quickstep/src/com/android/launcher3/popup/QuickstepSystemShortcut.java b/quickstep/src/com/android/launcher3/popup/QuickstepSystemShortcut.java index 86310fa14f..4e59790771 100644 --- a/quickstep/src/com/android/launcher3/popup/QuickstepSystemShortcut.java +++ b/quickstep/src/com/android/launcher3/popup/QuickstepSystemShortcut.java @@ -70,7 +70,8 @@ public interface QuickstepSystemShortcut { RecentsView recentsView = mTarget.getOverviewPanel(); recentsView.initiateSplitSelect( - new SplitSelectSource(view, new BitmapDrawable(bitmap), intent, mPosition)); + new SplitSelectSource(mOriginalView, new BitmapDrawable(bitmap), intent, + mPosition)); } } diff --git a/quickstep/src/com/android/quickstep/views/FloatingTaskView.java b/quickstep/src/com/android/quickstep/views/FloatingTaskView.java index 54420de6cb..c980d1eac2 100644 --- a/quickstep/src/com/android/quickstep/views/FloatingTaskView.java +++ b/quickstep/src/com/android/quickstep/views/FloatingTaskView.java @@ -196,6 +196,13 @@ public class FloatingTaskView extends FrameLayout { 0, 1, ACCEL); animation.addFloat(mThumbnailView, LauncherAnimUtils.VIEW_ALPHA, 1, 0, DEACCEL_3); + } else if (isStagedTask) { + // Fade in the placeholder view when split is initiated from homescreen / all apps + // icons. + if (mSplitPlaceholderView.getAlpha() == 0) { + animation.addFloat(mSplitPlaceholderView, SplitPlaceholderView.ALPHA_FLOAT, + 0.3f, 1, ACCEL); + } } MultiValueUpdateListener listener = new MultiValueUpdateListener() { diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java index 41b3f59e30..224c1f6c75 100644 --- a/quickstep/src/com/android/quickstep/views/RecentsView.java +++ b/quickstep/src/com/android/quickstep/views/RecentsView.java @@ -2757,16 +2757,15 @@ public abstract class RecentsView