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

Commit 4b71722f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes I0e3aadba,I037a2b2f into tm-qpr-dev am: c5637910 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19557873



Change-Id: Ibc0dd7a62a3111781af71575629c4c7edf2abea7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d00ed559 c5637910

libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/JetpackTaskFragmentOrganizer.java

+2 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import android.window.TaskFragmentOrganizer; 
import android.window.TaskFragmentTransaction;

import android.window.WindowContainerTransaction;



import androidx.annotation.GuardedBy;

import androidx.annotation.NonNull;

import androidx.annotation.Nullable;
@@ -93,6 +94,7 @@ class JetpackTaskFragmentOrganizer extends TaskFragmentOrganizer { 
    }



    /** No longer overrides the animation if the transition is on the given Task. */

    @GuardedBy("mLock")

    void stopOverrideSplitAnimation(int taskId) {

        if (mAnimationController != null) {

            mAnimationController.unregisterRemoteAnimations(taskId);

libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitContainer.java

+28 −1
Original line number Diff line number Diff line
@@ -17,8 +17,10 @@ 
package androidx.window.extensions.embedding;



import android.app.Activity;

import android.content.res.Configuration;

import android.util.Pair;

import android.util.Size;

import android.window.WindowContainerTransaction;



import androidx.annotation.NonNull;
@@ -32,14 +34,18 @@ class SplitContainer { 
    private final TaskFragmentContainer mSecondaryContainer;

    @NonNull

    private final SplitRule mSplitRule;

    @NonNull

    private SplitAttributes mSplitAttributes;



    SplitContainer(@NonNull TaskFragmentContainer primaryContainer,

            @NonNull Activity primaryActivity,

            @NonNull TaskFragmentContainer secondaryContainer,

            @NonNull SplitRule splitRule) {

            @NonNull SplitRule splitRule,

            @NonNull SplitAttributes splitAttributes) {

        mPrimaryContainer = primaryContainer;

        mSecondaryContainer = secondaryContainer;

        mSplitRule = splitRule;

        mSplitAttributes = splitAttributes;



        if (shouldFinishPrimaryWithSecondary(splitRule)) {

            if (mPrimaryContainer.getRunningActivityCount() == 1
@@ -72,6 +78,26 @@ class SplitContainer { 
        return mSplitRule;

    }



    @NonNull

    SplitAttributes getSplitAttributes() {

        return mSplitAttributes;

    }



    /**

     * Updates the {@link SplitAttributes} to this container.

     * It is usually used when there's a folding state change or

     * {@link SplitController#onTaskFragmentParentInfoChanged(WindowContainerTransaction, int,

     * Configuration)}.

     */

    void setSplitAttributes(@NonNull SplitAttributes splitAttributes) {

        mSplitAttributes = splitAttributes;

    }



    @NonNull

    TaskContainer getTaskContainer() {

        return getPrimaryContainer().getTaskContainer();

    }



    /** Returns the minimum dimension pair of primary container and secondary container. */

    @NonNull

    Pair<Size, Size> getMinDimensionsPair() {
@@ -141,6 +167,7 @@ class SplitContainer { 
                + " primaryContainer=" + mPrimaryContainer

                + " secondaryContainer=" + mSecondaryContainer

                + " splitRule=" + mSplitRule

                + " splitAttributes" + mSplitAttributes

                + "}";

    }

}

libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java

+121 −44
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ import static androidx.window.extensions.embedding.SplitContainer.shouldFinishAs 
import static androidx.window.extensions.embedding.SplitPresenter.RESULT_EXPAND_FAILED_NO_TF_INFO;

import static androidx.window.extensions.embedding.SplitPresenter.getActivityIntentMinDimensionsPair;

import static androidx.window.extensions.embedding.SplitPresenter.getNonEmbeddedActivityBounds;

import static androidx.window.extensions.embedding.SplitPresenter.shouldShowSideBySide;

import static androidx.window.extensions.embedding.SplitPresenter.shouldShowSplit;



import android.app.Activity;

import android.app.ActivityClient;
@@ -64,6 +64,7 @@ import android.util.Log; 
import android.util.Pair;

import android.util.Size;

import android.util.SparseArray;

import android.view.WindowMetrics;

import android.window.TaskFragmentInfo;

import android.window.TaskFragmentParentInfo;

import android.window.TaskFragmentTransaction;
@@ -102,6 +103,23 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen 
    // Currently applied split configuration.

    @GuardedBy("mLock")

    private final List<EmbeddingRule> mSplitRules = new ArrayList<>();

    /**

     * A developer-defined {@link SplitAttributes} calculator to compute the current

     * {@link SplitAttributes} with the current device and window states.

     * It is registered via {@link #setSplitAttributesCalculator(SplitAttributesCalculator)}

     * and unregistered via {@link #clearSplitAttributesCalculator()}.

     * This is called when:

     * <ul>

     *   <li>{@link SplitPresenter#updateSplitContainer(SplitContainer, TaskFragmentContainer,

     *     WindowContainerTransaction)}</li>

     *   <li>There's a started Activity which matches {@link SplitPairRule} </li>

     *   <li>Checking whether the place holder should be launched if there's a Activity matches

     *   {@link SplitPlaceholderRule} </li>

     * </ul>

     */

    @GuardedBy("mLock")

    @Nullable

    private SplitAttributesCalculator mSplitAttributesCalculator;

    /**

     * Map from Task id to {@link TaskContainer} which contains all TaskFragment and split pair info

     * below it.
@@ -187,12 +205,22 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen 


    @Override

    public void setSplitAttributesCalculator(@NonNull SplitAttributesCalculator calculator) {

        // TODO: Implement this method

        synchronized (mLock) {

            mSplitAttributesCalculator = calculator;

        }

    }



    @Override

    public void clearSplitAttributesCalculator() {

        // TODO: Implement this method

        synchronized (mLock) {

            mSplitAttributesCalculator = null;

        }

    }



    @GuardedBy("mLock")

    @Nullable

    SplitAttributesCalculator getSplitAttributesCalculator() {

        return mSplitAttributesCalculator;

    }



    @NonNull
@@ -582,6 +610,7 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen 
     * Updates if we should override transition animation. We only want to override if the Task

     * bounds is large enough for at least one split rule.

     */

    @GuardedBy("mLock")

    private void updateAnimationOverride(@NonNull TaskContainer taskContainer) {

        if (ENABLE_SHELL_TRANSITIONS) {

            // TODO(b/207070762): cleanup with legacy app transition
@@ -593,25 +622,37 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen 
            return;

        }



        // We only want to override if it supports split.

        if (supportSplit(taskContainer)) {

        // We only want to override if the TaskContainer may show split.

        if (mayShowSplit(taskContainer)) {

            mPresenter.startOverrideSplitAnimation(taskContainer.getTaskId());

        } else {

            mPresenter.stopOverrideSplitAnimation(taskContainer.getTaskId());

        }

    }



    private boolean supportSplit(@NonNull TaskContainer taskContainer) {

    /** Returns whether the given {@link TaskContainer} may show in split. */

    // Suppress GuardedBy warning because lint asks to mark this method as

    // @GuardedBy(mPresenter.mController.mLock), which is mLock itself

    @SuppressWarnings("GuardedBy")

    @GuardedBy("mLock")

    private boolean mayShowSplit(@NonNull TaskContainer taskContainer) {

        // No split inside PIP.

        if (taskContainer.isInPictureInPicture()) {

            return false;

        }

        // Always assume the TaskContainer if SplitAttributesCalculator is set

        if (mSplitAttributesCalculator != null) {

            return true;

        }

        // Check if the parent container bounds can support any split rule.

        for (EmbeddingRule rule : mSplitRules) {

            if (!(rule instanceof SplitRule)) {

                continue;

            }

            if (shouldShowSideBySide(taskContainer.getTaskBounds(), (SplitRule) rule)) {

            final SplitRule splitRule = (SplitRule) rule;

            final SplitAttributes splitAttributes = mPresenter.computeSplitAttributes(

                    taskContainer.getTaskProperties(), splitRule, null /* minDimensionsPair */);

            if (shouldShowSplit(splitAttributes)) {

                return true;

            }

        }
@@ -755,14 +796,18 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen 
    /**

     * Starts an activity to side of the launchingActivity with the provided split config.

     */

    // Suppress GuardedBy warning because lint ask to mark this method as

    // @GuardedBy(container.mController.mLock), which is mLock itself

    @SuppressWarnings("GuardedBy")

    @GuardedBy("mLock")

    private void startActivityToSide(@NonNull WindowContainerTransaction wct,

            @NonNull Activity launchingActivity, @NonNull Intent intent,

            @Nullable Bundle options, @NonNull SplitRule sideRule,

            @Nullable Consumer<Exception> failureCallback, boolean isPlaceholder) {

            @NonNull SplitAttributes splitAttributes, @Nullable Consumer<Exception> failureCallback,

            boolean isPlaceholder) {

        try {

            mPresenter.startActivityToSide(wct, launchingActivity, intent, options, sideRule,

                    isPlaceholder);

                    splitAttributes, isPlaceholder);

        } catch (Exception e) {

            if (failureCallback != null) {

                failureCallback.accept(e);
@@ -789,6 +834,10 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen 
    }



    /** Whether the given new launched activity is in a split with a rule matched. */

    // Suppress GuardedBy warning because lint asks to mark this method as

    // @GuardedBy(mPresenter.mController.mLock), which is mLock itself

    @SuppressWarnings("GuardedBy")

    @GuardedBy("mLock")

    private boolean isNewActivityInSplitWithRuleMatched(@NonNull Activity launchedActivity) {

        final TaskFragmentContainer container = getContainerWithActivity(launchedActivity);

        final SplitContainer splitContainer = getActiveSplitForContainer(container);
@@ -882,8 +931,9 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen 
        final TaskFragmentContainer primaryContainer = getContainerWithActivity(

                primaryActivity);

        final SplitContainer splitContainer = getActiveSplitForContainer(primaryContainer);

        final WindowMetrics taskWindowMetrics = mPresenter.getTaskWindowMetrics(primaryActivity);

        if (splitContainer != null && primaryContainer == splitContainer.getPrimaryContainer()

                && canReuseContainer(splitRule, splitContainer.getSplitRule())) {

                && canReuseContainer(splitRule, splitContainer.getSplitRule(), taskWindowMetrics)) {

            // Can launch in the existing secondary container if the rules share the same

            // presentation.

            final TaskFragmentContainer secondaryContainer = splitContainer.getSecondaryContainer();
@@ -1013,6 +1063,7 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen 
     */

    @VisibleForTesting

    @Nullable

    @GuardedBy("mLock")

    TaskFragmentContainer resolveStartActivityIntent(@NonNull WindowContainerTransaction wct,

            int taskId, @NonNull Intent intent, @Nullable Activity launchingActivity) {

        /*
@@ -1117,8 +1168,9 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen 
        }

        final TaskFragmentContainer existingContainer = getContainerWithActivity(primaryActivity);

        final SplitContainer splitContainer = getActiveSplitForContainer(existingContainer);

        final WindowMetrics taskWindowMetrics = mPresenter.getTaskWindowMetrics(primaryActivity);

        if (splitContainer != null && existingContainer == splitContainer.getPrimaryContainer()

                && (canReuseContainer(splitRule, splitContainer.getSplitRule())

                && (canReuseContainer(splitRule, splitContainer.getSplitRule(), taskWindowMetrics)

                // TODO(b/231845476) we should always respect clearTop.

                || !respectClearTop)

                && mPresenter.expandSplitContainerIfNeeded(wct, splitContainer, primaryActivity,
@@ -1208,12 +1260,16 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen 
     * Creates and registers a new split with the provided containers and configuration. Finishes

     * existing secondary containers if found for the given primary container.

     */

    // Suppress GuardedBy warning because lint ask to mark this method as

    // @GuardedBy(mPresenter.mController.mLock), which is mLock itself

    @SuppressWarnings("GuardedBy")

    @GuardedBy("mLock")

    void registerSplit(@NonNull WindowContainerTransaction wct,

            @NonNull TaskFragmentContainer primaryContainer, @NonNull Activity primaryActivity,

            @NonNull TaskFragmentContainer secondaryContainer,

            @NonNull SplitRule splitRule) {

            @NonNull SplitRule splitRule, @NonNull SplitAttributes splitAttributes) {

        final SplitContainer splitContainer = new SplitContainer(primaryContainer, primaryActivity,

                secondaryContainer, splitRule);

                secondaryContainer, splitRule, splitAttributes);

        // Remove container later to prevent pinning escaping toast showing in lock task mode.

        if (splitRule instanceof SplitPairRule && ((SplitPairRule) splitRule).shouldClearTop()) {

            removeExistingSecondaryContainers(wct, primaryContainer);
@@ -1364,6 +1420,12 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen 
            // Skip position update - one or both containers are finished.

            return;

        }

        final TaskContainer taskContainer = splitContainer.getTaskContainer();

        final SplitRule splitRule = splitContainer.getSplitRule();

        final Pair<Size, Size> minDimensionsPair = splitContainer.getMinDimensionsPair();

        final SplitAttributes splitAttributes = mPresenter.computeSplitAttributes(

                taskContainer.getTaskProperties(), splitRule, minDimensionsPair);

        splitContainer.setSplitAttributes(splitAttributes);

        if (dismissPlaceholderIfNecessary(wct, splitContainer)) {

            // Placeholder was finished, the positions will be updated when its container is emptied

            return;
@@ -1437,6 +1499,9 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen 
        return launchPlaceholderIfNecessary(wct, topActivity, false /* isOnCreated */);

    }



    // Suppress GuardedBy warning because lint ask to mark this method as

    // @GuardedBy(mPresenter.mController.mLock), which is mLock itself

    @SuppressWarnings("GuardedBy")

    @GuardedBy("mLock")

    boolean launchPlaceholderIfNecessary(@NonNull WindowContainerTransaction wct,

            @NonNull Activity activity, boolean isOnCreated) {
@@ -1463,18 +1528,20 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen 
            return false;

        }



        final TaskContainer.TaskProperties taskProperties = mPresenter.getTaskProperties(activity);

        final Pair<Size, Size> minDimensionsPair = getActivityIntentMinDimensionsPair(activity,

                placeholderRule.getPlaceholderIntent());

        if (!shouldShowSideBySide(

                mPresenter.getParentContainerBounds(activity), placeholderRule,

                minDimensionsPair)) {

        final SplitAttributes splitAttributes = mPresenter.computeSplitAttributes(taskProperties,

                placeholderRule, minDimensionsPair);

        if (!SplitPresenter.shouldShowSplit(splitAttributes)) {

            return false;

        }



        // TODO(b/190433398): Handle failed request

        final Bundle options = getPlaceholderOptions(activity, isOnCreated);

        startActivityToSide(wct, activity, placeholderRule.getPlaceholderIntent(), options,

                placeholderRule, null /* failureCallback */, true /* isPlaceholder */);

                placeholderRule, splitAttributes, null /* failureCallback */,

                true /* isPlaceholder */);

        return true;

    }
@@ -1499,6 +1566,9 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen 
        return options.toBundle();

    }



    // Suppress GuardedBy warning because lint ask to mark this method as

    // @GuardedBy(mPresenter.mController.mLock), which is mLock itself

    @SuppressWarnings("GuardedBy")

    @VisibleForTesting

    @GuardedBy("mLock")

    boolean dismissPlaceholderIfNecessary(@NonNull WindowContainerTransaction wct,
@@ -1511,11 +1581,10 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen 
            // The placeholder should remain after it was first shown.

            return false;

        }



        if (shouldShowSideBySide(splitContainer)) {

        final SplitAttributes splitAttributes = splitContainer.getSplitAttributes();

        if (SplitPresenter.shouldShowSplit(splitAttributes)) {

            return false;

        }



        mPresenter.cleanupContainer(wct, splitContainer.getSecondaryContainer(),

                false /* shouldFinishDependent */);

        return true;
@@ -1525,6 +1594,7 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen 
     * Returns the rule to launch a placeholder for the activity with the provided component name

     * if it is configured in the split config.

     */

    @GuardedBy("mLock")

    private SplitPlaceholderRule getPlaceholderRule(@NonNull Activity activity) {

        for (EmbeddingRule rule : mSplitRules) {

            if (!(rule instanceof SplitPlaceholderRule)) {
@@ -1541,6 +1611,7 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen 
    /**

     * Notifies listeners about changes to split states if necessary.

     */

    @GuardedBy("mLock")

    private void updateCallbackIfNecessary() {

        if (mEmbeddingCallback == null) {

            return;
@@ -1562,6 +1633,7 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen 
     * null, that indicates that the active split states are in an intermediate state and should

     * not be reported.

     */

    @GuardedBy("mLock")

    @Nullable

    private List<SplitInfo> getActiveSplitStates() {

        List<SplitInfo> splitStates = new ArrayList<>();
@@ -1580,20 +1652,8 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen 
                        .toActivityStack();

                final ActivityStack secondaryContainer = container.getSecondaryContainer()

                        .toActivityStack();

                final SplitAttributes.SplitType splitType = shouldShowSideBySide(container)

                        ? new SplitAttributes.SplitType.RatioSplitType(

                                container.getSplitRule().getSplitRatio())

                        : new SplitAttributes.SplitType.ExpandContainersSplitType();

                final SplitInfo splitState = new SplitInfo(primaryContainer, secondaryContainer,

                        // Splits that are not showing side-by-side are reported as having 0 split

                        // ratio, since by definition in the API the primary container occupies no

                        // width of the split when covered by the secondary.

                        // TODO(b/241042437): use v2 APIs for splitAttributes

                        new SplitAttributes.Builder()

                                .setSplitType(splitType)

                                .setLayoutDirection(container.getSplitRule().getLayoutDirection())

                                .build()

                        );

                        container.getSplitAttributes());

                splitStates.add(splitState);

            }

        }
@@ -1631,6 +1691,7 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen 
     * Returns a split rule for the provided pair of primary activity and secondary activity intent

     * if available.

     */

    @GuardedBy("mLock")

    @Nullable

    private SplitPairRule getSplitRule(@NonNull Activity primaryActivity,

            @NonNull Intent secondaryActivityIntent) {
@@ -1649,6 +1710,7 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen 
    /**

     * Returns a split rule for the provided pair of primary and secondary activities if available.

     */

    @GuardedBy("mLock")

    @Nullable

    private SplitPairRule getSplitRule(@NonNull Activity primaryActivity,

            @NonNull Activity secondaryActivity) {
@@ -1723,6 +1785,7 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen 
     * Returns {@code true} if an Activity with the provided component name should always be

     * expanded to occupy full task bounds. Such activity must not be put in a split.

     */

    @GuardedBy("mLock")

    private boolean shouldExpand(@Nullable Activity activity, @Nullable Intent intent) {

        for (EmbeddingRule rule : mSplitRules) {

            if (!(rule instanceof ActivityRule)) {
@@ -1748,6 +1811,10 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen 
     * 'sticky' and the placeholder was finished when fully overlapping the primary container.

     * @return {@code true} if the associated container should be retained (and not be finished).

     */

    // Suppress GuardedBy warning because lint ask to mark this method as

    // @GuardedBy(mPresenter.mController.mLock), which is mLock itself

    @SuppressWarnings("GuardedBy")

    @GuardedBy("mLock")

    boolean shouldRetainAssociatedContainer(@NonNull TaskFragmentContainer finishingContainer,

            @NonNull TaskFragmentContainer associatedContainer) {

        SplitContainer splitContainer = getActiveSplitForContainers(associatedContainer,
@@ -1766,7 +1833,7 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen 
        }

        // Decide whether the associated container should be retained based on the current

        // presentation mode.

        if (shouldShowSideBySide(splitContainer)) {

        if (shouldShowSplit(splitContainer)) {

            return !shouldFinishAssociatedContainerWhenAdjacent(finishBehavior);

        } else {

            return !shouldFinishAssociatedContainerWhenStacked(finishBehavior);
@@ -1959,23 +2026,33 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen 
     * If the two rules have the same presentation, we can reuse the same {@link SplitContainer} if

     * there is any.

     */

    private static boolean canReuseContainer(@NonNull SplitRule rule1, @NonNull SplitRule rule2) {

    private static boolean canReuseContainer(@NonNull SplitRule rule1, @NonNull SplitRule rule2,

            @NonNull WindowMetrics parentWindowMetrics) {

        if (!isContainerReusableRule(rule1) || !isContainerReusableRule(rule2)) {

            return false;

        }

        return haveSamePresentation((SplitPairRule) rule1, (SplitPairRule) rule2);

        return haveSamePresentation((SplitPairRule) rule1, (SplitPairRule) rule2,

                parentWindowMetrics);

    }



    /** Whether the two rules have the same presentation. */

    private static boolean haveSamePresentation(@NonNull SplitPairRule rule1,

            @NonNull SplitPairRule rule2) {

    @VisibleForTesting

    static boolean haveSamePresentation(@NonNull SplitPairRule rule1,

            @NonNull SplitPairRule rule2, @NonNull WindowMetrics parentWindowMetrics) {

        if (rule1.getTag() != null || rule2.getTag() != null) {

            // Tag must be unique if it is set. We don't want to reuse the container if the rules

            // have different tags because they can have different SplitAttributes later through

            // SplitAttributesCalculator.

            return Objects.equals(rule1.getTag(), rule2.getTag());

        }

        // If both rules don't have tag, compare all SplitRules' properties that may affect their

        // SplitAttributes.

        // TODO(b/231655482): add util method to do the comparison in SplitPairRule.

        return rule1.getSplitRatio() == rule2.getSplitRatio()

                && rule1.getLayoutDirection() == rule2.getLayoutDirection()

                && rule1.getFinishPrimaryWithSecondary()

                == rule2.getFinishPrimaryWithSecondary()

                && rule1.getFinishSecondaryWithPrimary()

                == rule2.getFinishSecondaryWithPrimary();

        return rule1.getDefaultSplitAttributes().equals(rule2.getDefaultSplitAttributes())

                && rule1.checkParentMetrics(parentWindowMetrics)

                == rule2.checkParentMetrics(parentWindowMetrics)

                && rule1.getFinishPrimaryWithSecondary() == rule2.getFinishPrimaryWithSecondary()

                && rule1.getFinishSecondaryWithPrimary() == rule2.getFinishSecondaryWithPrimary();

    }



    /**