Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f44a6ae authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 9101843 from 178a45a5 to tm-qpr1-release

Change-Id: I7c61c97a1cd4d84a436d9ab17871950c38607f63
parents 905acee3 178a45a5
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ public class FloatingTaskIntentResolver {
            return null;
        }
        ComponentName component = new ComponentName(packageName, activityName);
        Intent intent = new Intent(action).setComponent(component);
        Intent intent = new Intent(action).setComponent(component).setPackage(packageName);
        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
        Log.d(TAG, "createIntent returning: " + intent);
        return intent;
+1 −1
Original line number Diff line number Diff line
@@ -895,7 +895,7 @@ public class QuickstepLauncher extends Launcher {
        // load in, and then proceed to OverviewSplitSelect.
        if (isInState(OVERVIEW_SPLIT_SELECT)) {
            SplitSelectStateController splitSelectStateController =
                    ((RecentsView) getOverviewPanel()).getSplitPlaceholder();
                    ((RecentsView) getOverviewPanel()).getSplitSelectController();
            // Launcher will restart in Overview and then transition to OverviewSplitSelect.
            outState.putIBinder(PENDING_SPLIT_SELECT_INFO, ObjectWrapper.wrap(
                    new PendingSplitSelectInfo(
+1 −8
Original line number Diff line number Diff line
@@ -1140,13 +1140,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
            boolean isCancel) {
        long duration = MAX_SWIPE_DURATION;
        float currentShift = mCurrentShift.value;
        boolean recentsVisible = mRecentsView != null
                && (mRecentsView.getWindowVisibility() == View.VISIBLE);
        if (!recentsVisible) {
            // We've hit a case where Launcher is been stopped mid-gesture, in this case, force
            // a LAST_TASK end target
            isCancel = true;
        }
        final GestureEndTarget endTarget = calculateEndTarget(velocity, endVelocity,
                isFling, isCancel);
        // Set the state, but don't notify until the animation completes
@@ -1226,7 +1219,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,

        // Let RecentsView handle the scrolling to the task, which we launch in startNewTask()
        // or resumeLastTask().
        if (recentsVisible) {
        if (mRecentsView != null) {
            ActiveGestureLog.INSTANCE.trackEvent(ActiveGestureErrorDetector.GestureEvent
                    .SET_ON_PAGE_TRANSITION_END_CALLBACK);
            mRecentsView.setOnPageTransitionEndCallback(
+5 −2
Original line number Diff line number Diff line
@@ -240,8 +240,11 @@ public class OverviewCommandHelper {
                interactionHandler.onGestureCancelled();
                cmd.removeListener(this);

                RecentsView createdRecents =
                        activityInterface.getCreatedActivity().getOverviewPanel();
                T createdActivity = activityInterface.getCreatedActivity();
                if (createdActivity == null) {
                    return;
                }
                RecentsView createdRecents = createdActivity.getOverviewPanel();
                if (createdRecents != null) {
                    createdRecents.onRecentsAnimationComplete();
                }
+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ public class FloatingTaskView extends FrameLayout {

        RecentsView recentsView = launcher.getOverviewPanel();
        mOrientationHandler = recentsView.getPagedOrientationHandler();
        mStagePosition = recentsView.getSplitPlaceholder().getActiveSplitStagePosition();
        mStagePosition = recentsView.getSplitSelectController().getActiveSplitStagePosition();
        mSplitPlaceholderView.setIcon(icon,
                mContext.getResources().getDimensionPixelSize(R.dimen.split_placeholder_icon_size));
        mSplitPlaceholderView.getIconView().setRotation(mOrientationHandler.getDegreesRotated());
Loading