commit 4dc69f36a5a1e210ec2eed939008982b80c6b09f
author Aran Ink <nesciosquid@google.com> Tue Dec 17 14:37:59 2019 -0500
committer Aran Ink <nesciosquid@google.com> Tue Dec 17 15:55:54 2019 -0500
tree b40a037a7845d1369f2d3a3957a43fc496a41c53
parent 30e1d6bd76171857199098057b4f55ae638d01b4

Correctly prevent the bubble screenshot menu when setting missing.

Fixes: 146437754

Test: Manual. With setting disabled, long-press on bubbles does nothing. With setting enabled (adb shell settings put secure allow_bubble_screenshot_menu 1), long press shows the screenshot menu.
Change-Id: Ic48749b0377e41ed06daf6742a7cc08e64e1db5f

packages/SystemUI/src/com/android/systemui/bubbles/BubbleTouchHandler.java

diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleTouchHandler.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleTouchHandler.java
index 995b35f..fdeaf1f 100644
--- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleTouchHandler.java
+++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleTouchHandler.java
@@ -134,7 +134,8 @@
                 if (isStack) {
                     mViewPositionOnTouchDown.set(mStack.getStackPosition());
                     mStack.onDragStart();
-                    if (!mStack.isShowingBubbleMenu() && !mStack.isExpanded()) {
+                    if (!mStack.isShowingBubbleMenu() && !mStack.isExpanded()
+                            && BubbleExperimentConfig.allowBubbleScreenshotMenu(mContext)) {
                         mShowBubbleMenuRunnable = mStack::showBubbleMenu;
                         mStack.postDelayed(mShowBubbleMenuRunnable,
                                 ViewConfiguration.getLongPressTimeout());