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

Commit 51aec7f5 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 am: 4b71722f 

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



Change-Id: Ibcb67396b16702afc6d04904afbabf9b03a18a36
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ba5fd0cf 4b71722f

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

File changed.

Preview size limit exceeded, changes collapsed.

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

+426 −119

File changed.

Preview size limit exceeded, changes collapsed.

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

+29 −0
Original line number Diff line number Diff line
@@ -132,6 +132,11 @@ class TaskContainer { 
        return new Configuration(mConfiguration);

    }



    @NonNull

    TaskProperties getTaskProperties() {

        return new TaskProperties(mDisplayId, mConfiguration);

    }



    void updateTaskFragmentParentInfo(@NonNull TaskFragmentParentInfo info) {

        mConfiguration.setTo(info.getConfiguration());

        mDisplayId = info.getDisplayId();
@@ -215,4 +220,28 @@ class TaskContainer { 
    int indexOf(@NonNull TaskFragmentContainer child) {

        return mContainers.indexOf(child);

    }



    /**

     * A wrapper class which contains the display ID and {@link Configuration} of a

     * {@link TaskContainer}

     */

    static final class TaskProperties {

        private final int mDisplayId;

        @NonNull

        private final Configuration mConfiguration;



        TaskProperties(int displayId, @NonNull Configuration configuration) {

            mDisplayId = displayId;

            mConfiguration = configuration;

        }



        int getDisplayId() {

            return mDisplayId;

        }



        @NonNull

        Configuration getConfiguration() {

            return mConfiguration;

        }

    }

}