Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1862ad0b authored by Darrell Shi's avatar Darrell Shi
Browse files

Do not handle GH touch when scene container enabled 

Fix: 370106150
Test: does not crash with scene container enabled
Flag: com.android.systemui.scene_container
Change-Id: I07599decf46dcf8f0c67f8d6d099a18e5508eb91
parent 435ec085

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

+11 −3
Original line number Diff line number Diff line
@@ -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;

        if (!SceneContainerFlag.isEnabled()) {

            mGlanceableHubContainerController = glanceableHubContainerController;

        } else {

            mGlanceableHubContainerController = null;

        }

        mEmergencyGestureIntentFactory = emergencyGestureIntentFactory;



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


    @Override

    public void handleCommunalHubTouch(MotionEvent event) {

        if (mGlanceableHubContainerController != null) {

            mGlanceableHubContainerController.onTouchEvent(event);

        }

    }



    @Override

    public void awakenDreams() {