diff options
| author | Catherine Liang <cathliang@google.com> | 2023-12-13 20:31:33 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2023-12-13 20:31:33 +0000 |
| commit | 3039b071c023bf450d47b4498f5032ca777eed43 (patch) | |
| tree | 30976e4283d7c5aff0146bace373097c8d6d0259 | |
| parent | 7a879885dd183668a92e518c3b12e9a402a15694 (diff) | |
| parent | 92951bb497044253c1dddc0328cd86b8dffb1759 (diff) | |
| download | WallpaperPicker2-3039b071c023bf450d47b4498f5032ca777eed43.tar.gz | |
Merge "Turn off WIP small to full preview transition animation" into main
| -rw-r--r-- | res/layout/fragment_full_preview.xml | 1 | ||||
| -rw-r--r-- | src/com/android/wallpaper/picker/preview/ui/fragment/FullPreviewFragment.kt | 10 |
2 files changed, 9 insertions, 2 deletions
diff --git a/res/layout/fragment_full_preview.xml b/res/layout/fragment_full_preview.xml index df296e5a..d9f59ba1 100644 --- a/res/layout/fragment_full_preview.xml +++ b/res/layout/fragment_full_preview.xml @@ -32,6 +32,7 @@ <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@android:color/transparent" android:fitsSystemWindows="true"> <include android:id="@+id/toolbar_container" diff --git a/src/com/android/wallpaper/picker/preview/ui/fragment/FullPreviewFragment.kt b/src/com/android/wallpaper/picker/preview/ui/fragment/FullPreviewFragment.kt index c0228254..4092fedc 100644 --- a/src/com/android/wallpaper/picker/preview/ui/fragment/FullPreviewFragment.kt +++ b/src/com/android/wallpaper/picker/preview/ui/fragment/FullPreviewFragment.kt @@ -51,8 +51,10 @@ class FullPreviewFragment : Hilt_FullPreviewFragment() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - sharedElementEnterTransition = - TransitionInflater.from(appContext).inflateTransition(R.transition.shared_view) + if (ENABLE_ANIMATION) { + sharedElementEnterTransition = + TransitionInflater.from(appContext).inflateTransition(R.transition.shared_view) + } } override fun onCreateView( @@ -104,4 +106,8 @@ class FullPreviewFragment : Hilt_FullPreviewFragment() { override fun getToolbarTextColor(): Int { return ContextCompat.getColor(requireContext(), R.color.system_on_surface) } + + companion object { + const val ENABLE_ANIMATION = false + } } |