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

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

Merge "Remove outdated Extensions AnimationBackgroundColor API" into main

parents f23b8a96 4374cfe2

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

+2 −1
Original line number Diff line number Diff line
@@ -375,7 +375,8 @@ class JetpackTaskFragmentOrganizer extends TaskFragmentOrganizer { 
            return TaskFragmentAnimationParams.DEFAULT;

        }

        return new TaskFragmentAnimationParams.Builder()

                .setAnimationBackgroundColor(splitAttributes.getAnimationBackgroundColor())

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

                // .setAnimationBackgroundColor(splitAttributes.getAnimationBackgroundColor())

                .build();

    }

}

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

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

                .setSplitType(splitTypeToUpdate)

                .setLayoutDirection(splitAttributes.getLayoutDirection())

                .setAnimationBackgroundColor(splitAttributes.getAnimationBackgroundColor())

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

                // .setAnimationBackgroundColor(splitAttributes.getAnimationBackgroundColor())

                .build();

    }

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

+3 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package androidx.window.extensions;



import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;



import static com.google.common.truth.Truth.assertThat;



import android.app.ActivityTaskManager;
@@ -69,6 +70,7 @@ public class WindowExtensionsTest { 
                .isEqualTo(SplitAttributes.LayoutDirection.LOCALE);

        assertThat(splitAttributes.getSplitType())

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

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

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

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

    }

}