commit 3afe6c47fcab382e2b84c72ec2032b3f2f4ce12e
author Darrell Shi <darrellshi@google.com> Fri Sep 20 17:08:00 2024 -0700
committer Darrell Shi <darrellshi@google.com> Fri Sep 20 17:08:00 2024 -0700
tree e584c7a5b615fb0037a8824292c03cf00bd9ad08
parent ba72d5edf1d6246442dd9e80521cc3346250f55b

Disable dream touch handling on scene container

Custom touch handling on dreams is no longer needed when scene container
is enabled.

Bug: 365999124
Test: manual
Flag: com.android.systemui.scene_container
Change-Id: I4a69214a37819624403a728eafa72bf693e52a47

packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayService.java

diff --git a/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayService.java b/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayService.java
index 113e001..83f86a7 100644
--- a/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayService.java
+++ b/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayService.java
@@ -65,6 +65,7 @@
 import com.android.systemui.keyguard.domain.interactor.KeyguardInteractor;
 import com.android.systemui.navigationbar.gestural.domain.GestureInteractor;
 import com.android.systemui.navigationbar.gestural.domain.TaskMatcher;
+import com.android.systemui.scene.shared.flag.SceneContainerFlag;
 import com.android.systemui.shade.ShadeExpansionChangeEvent;
 import com.android.systemui.touch.TouchInsetManager;
 import com.android.systemui.util.concurrency.DelayableExecutor;
@@ -499,8 +500,11 @@
 
         mDreamOverlayContainerViewController =
                 dreamOverlayComponent.getDreamOverlayContainerViewController();
-        mTouchMonitor = ambientTouchComponent.getTouchMonitor();
-        mTouchMonitor.init();
+
+        if (!SceneContainerFlag.isEnabled()) {
+            mTouchMonitor = ambientTouchComponent.getTouchMonitor();
+            mTouchMonitor.init();
+        }
 
         mStateController.setShouldShowComplications(shouldShowComplications());