Merge "Global Actions - Remove outside touches" into rvc-dev am: b39dff8a1f

Change-Id: I562381cb7f8532ef45ea316954d2d2c9f6800fd5
This commit is contained in:
TreeHugger Robot
2020-04-23 23:53:03 +00:00
committed by Automerger Merge Worker

View File

@@ -2039,7 +2039,6 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener,
fixNavBarClipping();
mControlsView = findViewById(com.android.systemui.R.id.global_actions_controls);
mGlobalActionsLayout = findViewById(com.android.systemui.R.id.global_actions_view);
mGlobalActionsLayout.setOutsideTouchListener(view -> dismiss());
mGlobalActionsLayout.setListViewAccessibilityDelegate(new View.AccessibilityDelegate() {
@Override
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()) {
initializePanel();
}