Merge "Do not handle GH touch when scene container enabled" into main (b3820ebb) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java

+11 −3

Original line number	Diff line number	Diff line
		@@ -594,7 +594,9 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces {
		private final ColorExtractor.OnColorsChangedListener mOnColorsChangedListener =
		(extractor, which) -> updateTheme();
		private final BrightnessMirrorShowingInteractor mBrightnessMirrorShowingInteractor;
		private final GlanceableHubContainerController mGlanceableHubContainerController;

		// Only use before the scene container. Null if scene container is enabled.
		@Nullable private final GlanceableHubContainerController mGlanceableHubContainerController;

		private final EmergencyGestureIntentFactory mEmergencyGestureIntentFactory;

		@@ -807,7 +809,11 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces {
		mFingerprintManager = fingerprintManager;
		mActivityStarter = activityStarter;
		mBrightnessMirrorShowingInteractor = brightnessMirrorShowingInteractor;
		if (!SceneContainerFlag.isEnabled()) {
		mGlanceableHubContainerController = glanceableHubContainerController;
		} else {
		mGlanceableHubContainerController = null;
		}
		mEmergencyGestureIntentFactory = emergencyGestureIntentFactory;

		mLockscreenShadeTransitionController = lockscreenShadeTransitionController;
		@@ -2972,8 +2978,10 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces {

		@Override
		public void handleCommunalHubTouch(MotionEvent event) {
		if (mGlanceableHubContainerController != null) {
		mGlanceableHubContainerController.onTouchEvent(event);
		}
		}

		@Override
		public void awakenDreams() {