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

Commit 479b823d authored by Chris Li's avatar Chris Li Committed by Android (Google) Code Review
Browse files

Merge "Add back Extensions AnimationBackground API" into main

parents fa5112d6 66b920b6

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

+8 −4
Original line number Diff line number Diff line
@@ -382,9 +382,13 @@ class JetpackTaskFragmentOrganizer extends TaskFragmentOrganizer { 
        if (splitAttributes == null) {

            return TaskFragmentAnimationParams.DEFAULT;

        }

        final AnimationBackground animationBackground = splitAttributes.getAnimationBackground();

        if (animationBackground instanceof AnimationBackground.ColorBackground colorBackground) {

            return new TaskFragmentAnimationParams.Builder()

                // TODO(b/263047900): Update extensions API.

                // .setAnimationBackgroundColor(splitAttributes.getAnimationBackgroundColor())

                    .setAnimationBackgroundColor(colorBackground.getColor())

                    .build();

        } else {

            return TaskFragmentAnimationParams.DEFAULT;

        }

    }

}

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

+1 −2
Original line number Diff line number Diff line
@@ -893,8 +893,7 @@ class SplitPresenter extends JetpackTaskFragmentOrganizer { 
        return new SplitAttributes.Builder()

                .setSplitType(splitTypeToUpdate)

                .setLayoutDirection(splitAttributes.getLayoutDirection())

                // TODO(b/263047900): Update extensions API.

                // .setAnimationBackgroundColor(splitAttributes.getAnimationBackgroundColor())

                .setAnimationBackground(splitAttributes.getAnimationBackground())

                .build();

    }

libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/WindowExtensionsTest.java

+3 −2
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.platform.test.annotations.Presubmit; 


import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.filters.SmallTest;

import androidx.window.extensions.embedding.AnimationBackground;

import androidx.window.extensions.embedding.SplitAttributes;



import org.junit.Before;
@@ -70,7 +71,7 @@ public class WindowExtensionsTest { 
                .isEqualTo(SplitAttributes.LayoutDirection.LOCALE);

        assertThat(splitAttributes.getSplitType())

                .isEqualTo(new SplitAttributes.SplitType.RatioSplitType(0.5f));

        // TODO(b/263047900): Update extensions API.

        // assertThat(splitAttributes.getAnimationBackgroundColor()).isEqualTo(0);

        assertThat(splitAttributes.getAnimationBackground())

                .isEqualTo(AnimationBackground.ANIMATION_BACKGROUND_DEFAULT);

    }

}