diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java index 1d3f0e1f6dc3..e99f6279cd23 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java @@ -593,7 +593,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; @@ -806,7 +808,11 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { mFingerprintManager = fingerprintManager; mActivityStarter = activityStarter; mBrightnessMirrorShowingInteractor = brightnessMirrorShowingInteractor; - mGlanceableHubContainerController = glanceableHubContainerController; + if (!SceneContainerFlag.isEnabled()) { + mGlanceableHubContainerController = glanceableHubContainerController; + } else { + mGlanceableHubContainerController = null; + } mEmergencyGestureIntentFactory = emergencyGestureIntentFactory; mLockscreenShadeTransitionController = lockscreenShadeTransitionController; @@ -2920,7 +2926,9 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { @Override public void handleCommunalHubTouch(MotionEvent event) { - mGlanceableHubContainerController.onTouchEvent(event); + if (mGlanceableHubContainerController != null) { + mGlanceableHubContainerController.onTouchEvent(event); + } } @Override |