Merge "Fixes re-setting activity type when embed activity in split-screen" into sc-v2-dev

    }

    /** Called when an {@link ActivityRecord} is added as a descendant */

    void onDescendantActivityAdded(boolean hadChild, int activityType, ActivityRecord r) {

    void onDescendantActivityAdded(boolean hadActivity, int activityType, ActivityRecord r) {

        warnForNonLeafTask("onDescendantActivityAdded");

        // Only set this based on the first activity

        if (!hadChild) {

        if (!hadActivity) {

            if (r.getActivityType() == ACTIVITY_TYPE_UNDEFINED) {

                // Normally non-standard activity type for the activity record will be set when the

                // object is created, however we delay setting the standard application type until

import java.io.PrintWriter;

import java.util.ArrayList;

import java.util.List;

import java.util.Objects;

import java.util.function.Consumer;

import java.util.function.Function;

        boolean isAddingActivity = child.asActivityRecord() != null;

        final Task task = isAddingActivity ? getTask() : null;

        // If this task had any child before we added this one.

        boolean taskHadChild = task != null && task.hasChild();

        // If this task had any activity before we added this one.

        boolean taskHadActivity = task != null && task.getActivity(Objects::nonNull) != null;

        // getActivityType() looks at the top child, so we need to read the type before adding

        // a new child in case the new child is on top and UNDEFINED.

        final int activityType = task != null ? task.getActivityType() : ACTIVITY_TYPE_UNDEFINED;

        if (isAddingActivity && task != null) {

            child.asActivityRecord().inHistory = true;

            task.onDescendantActivityAdded(taskHadChild, activityType, child.asActivityRecord());

            task.onDescendantActivityAdded(taskHadActivity, activityType, child.asActivityRecord());

        }

    }