| commit | 4490339b6f1df65a0c11c044f4da4974ed446be8 | [log] [tgz] |
|---|---|---|
| author | Chaohui Wang <chaohuiw@google.com> | Mon Nov 20 03:21:27 2023 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Nov 20 03:21:27 2023 +0000 |
| tree | 21f4f6dd86b62783678203a7d115928f4beeb837 | |
| parent | 6b34d83f1e9d97830c56279d3e8c5567674abcc4 [diff] | |
| parent | b4ba27e8d0ab9894b0f30260c3b2ed771dfe00f1 [diff] |
Merge "New RestrictedMainSwitchPreference" into main
diff --git a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/JetpackTaskFragmentOrganizer.java b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/JetpackTaskFragmentOrganizer.java index 4d73c20..ca3d8d1 100644 --- a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/JetpackTaskFragmentOrganizer.java +++ b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/JetpackTaskFragmentOrganizer.java
@@ -375,7 +375,8 @@ return TaskFragmentAnimationParams.DEFAULT; } return new TaskFragmentAnimationParams.Builder() - .setAnimationBackgroundColor(splitAttributes.getAnimationBackgroundColor()) + // TODO(b/263047900): Update extensions API. + // .setAnimationBackgroundColor(splitAttributes.getAnimationBackgroundColor()) .build(); } }
diff --git a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitPresenter.java b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitPresenter.java index faf7c39..b5c32bb 100644 --- a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitPresenter.java +++ b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitPresenter.java
@@ -854,7 +854,8 @@ return new SplitAttributes.Builder() .setSplitType(splitTypeToUpdate) .setLayoutDirection(splitAttributes.getLayoutDirection()) - .setAnimationBackgroundColor(splitAttributes.getAnimationBackgroundColor()) + // TODO(b/263047900): Update extensions API. + // .setAnimationBackgroundColor(splitAttributes.getAnimationBackgroundColor()) .build(); }
diff --git a/libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/WindowExtensionsTest.java b/libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/WindowExtensionsTest.java index 9607b78..60beb0b 100644 --- a/libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/WindowExtensionsTest.java +++ b/libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/WindowExtensionsTest.java
@@ -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 @@ .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); } }