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

Commit ac84ed99 authored by Bryce Lee's avatar Bryce Lee Committed by Android (Google) Code Review
Browse files

Merge "Revert "Set correct focus activity when using FLAG_ACTIVITY_REORDER_TO_FRONT""

parents 02d3a616 d71317c9
Loading
Loading
Loading
Loading
+3 −15
Original line number Diff line number Diff line
@@ -969,18 +969,9 @@ final class TaskRecord extends ConfigurationContainer implements TaskWindowConta
                || topRunningActivityLocked() != null;
    }

    void setFrontOfTask() {
        setFrontOfTask(null);
    }

    /** Call after activity movement or finish to make sure that frontOfTask is set correctly */
    void setFrontOfTask(ActivityRecord newTop) {
        // If a top candidate is suggested by the caller, go ahead and use it and mark all others
        // as not front. This is needed in situations where the current front activity in the
        // task isn't finished yet and we want to set the front to the activity moved to the front
        // of the task.
        boolean foundFront = newTop != null ? true : false;

    final void setFrontOfTask() {
        boolean foundFront = false;
        final int numActivities = mActivities.size();
        for (int activityNdx = 0; activityNdx < numActivities; ++activityNdx) {
            final ActivityRecord r = mActivities.get(activityNdx);
@@ -997,9 +988,6 @@ final class TaskRecord extends ConfigurationContainer implements TaskWindowConta
            // activity, make the bottom activity front.
            mActivities.get(0).frontOfTask = true;
        }
        if (newTop != null) {
            newTop.frontOfTask = true;
        }
    }

    /**
@@ -1014,7 +1002,7 @@ final class TaskRecord extends ConfigurationContainer implements TaskWindowConta
        mActivities.add(newTop);
        updateEffectiveIntent();

        setFrontOfTask(newTop);
        setFrontOfTask();
    }

    void addActivityAtBottom(ActivityRecord r) {