From a08b7c4218269ded5cd7a55fdb7e871bc4d6f9ff Mon Sep 17 00:00:00 2001 From: Uwais Ashraf Date: Thu, 19 Dec 2024 13:28:58 +0000 Subject: [PATCH] Move TaskThumbnailViewData initialisation to init. This is because onLayout can be called before onAttachedToWindow so this property needs to be initialised as it is used in onLayout. Fix: 383733481 Flag: com.android.launcher3.enable_refactor_task_thumbnail Test: Manual checking of split select and incorrect orientation for now but will be tested by view screenshot tests. Change-Id: I40937b8b1b98209e77cb5ee64f5c4342b90faf97 --- .../android/quickstep/task/thumbnail/TaskThumbnailView.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/quickstep/src/com/android/quickstep/task/thumbnail/TaskThumbnailView.kt b/quickstep/src/com/android/quickstep/task/thumbnail/TaskThumbnailView.kt index e33469562d..20794bf5c1 100644 --- a/quickstep/src/com/android/quickstep/task/thumbnail/TaskThumbnailView.kt +++ b/quickstep/src/com/android/quickstep/task/thumbnail/TaskThumbnailView.kt @@ -52,7 +52,10 @@ class TaskThumbnailView : FrameLayout, ViewPool.Reusable { private val recentsCoroutineScope: CoroutineScope = RecentsDependencies.get() private val dispatcherProvider: DispatcherProvider = RecentsDependencies.get() - private lateinit var viewData: TaskThumbnailViewData + // This is initialised here and set in onAttachedToWindow because onLayout can be called before + // onAttachedToWindow so this property needs to be initialised as it is used below. + private var viewData: TaskThumbnailViewData = RecentsDependencies.get(this) + private lateinit var viewModel: TaskThumbnailViewModel private lateinit var viewAttachedScope: CoroutineScope