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

Commit 36fa1652 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Global Actions - Remove outside touches" into rvc-dev am: b39dff8a am: 905a2dcc 

Change-Id: I3347d8e13b8c974d89130e2c2ccd314938b806f6
parents 05afae99 905a2dcc

packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java

+0 −10
Original line number Original line Diff line number Diff line
@@ -2039,7 +2039,6 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener, 
            fixNavBarClipping();

            fixNavBarClipping();

            mControlsView = findViewById(com.android.systemui.R.id.global_actions_controls);

            mControlsView = findViewById(com.android.systemui.R.id.global_actions_controls);

            mGlobalActionsLayout = findViewById(com.android.systemui.R.id.global_actions_view);

            mGlobalActionsLayout = findViewById(com.android.systemui.R.id.global_actions_view);

            mGlobalActionsLayout.setOutsideTouchListener(view -> dismiss());

            mGlobalActionsLayout.setListViewAccessibilityDelegate(new View.AccessibilityDelegate() {

            mGlobalActionsLayout.setListViewAccessibilityDelegate(new View.AccessibilityDelegate() {

                @Override

                @Override

                public boolean dispatchPopulateAccessibilityEvent(

                public boolean dispatchPopulateAccessibilityEvent(
@@ -2078,15 +2077,6 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener, 
                }

                }

            }

            }





            View globalActionsParent = (View) mGlobalActionsLayout.getParent();

            globalActionsParent.setOnClickListener(v -> dismiss());



            // add fall-through dismiss handling to root view

            View rootView = findViewById(com.android.systemui.R.id.global_actions_grid_root);

            if (rootView != null) {

                rootView.setOnClickListener(v -> dismiss());

            }



            if (shouldUsePanel()) {

            if (shouldUsePanel()) {

                initializePanel();

                initializePanel();

            }

            }