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

Commit b15d99d5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[Dual Shade] Add missing return statement in onShadeExpansionGesture." into main

parents befe6482 38510172

packages/SystemUI/src/com/android/systemui/LauncherProxyService.java

+2 −3
Original line number Diff line number Diff line
@@ -305,9 +305,7 @@ public class LauncherProxyService implements CallbackController<LauncherProxyLis 
            if (ShadeWindowGoesAround.isEnabled() && !SceneContainerFlag.isEnabled()) {

                // For legacy shade case, don't attempt to handle touch events on display that

                // doesn't have the shade. They're handled with SceneContainerFlag enabled.

                boolean touchingDisplayWithoutShade =

                        event.getDisplayId() != mShadeDisplayPolicy.getDisplayId().getValue();

                return touchingDisplayWithoutShade;

                return event.getDisplayId() != mShadeDisplayPolicy.getDisplayId().getValue();

            }

            return false;

        }
@@ -514,6 +512,7 @@ public class LauncherProxyService implements CallbackController<LauncherProxyLis 
            }

            if (!mShadeModeInteractor.get().isDualShade()) {

                mShadeInteractor.get().expandNotificationsShade(reason, null);

                return;

            }



            final DisplayInfo displayInfo = new DisplayInfo();