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

Commit 27a183b4 authored by Josh Tsuji's avatar Josh Tsuji Committed by Automerger Merge Worker
Browse files

Merge "Don't crash if we've already been educated about Bubbles." into rvc-dev am: 907e00b2

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11821821

Change-Id: I46d6c29b5e8a1d4b80c4f89c2516ef68259f8b76
parents a770c943 907e00b2
Loading
Loading
Loading
Loading
+6 −3
Original line number Original line Diff line number Diff line
@@ -1975,9 +1975,12 @@ public class BubbleStackView extends FrameLayout
    @Override
    @Override
    public void subtractObscuredTouchableRegion(Region touchableRegion, View view) {
    public void subtractObscuredTouchableRegion(Region touchableRegion, View view) {
        // If the notification shade is expanded, or the manage menu is open, or we are showing
        // If the notification shade is expanded, or the manage menu is open, or we are showing
        // manage bubbles user education, we shouldn't let the
        // manage bubbles user education, we shouldn't let the ActivityView steal any touch events
        // ActivityView steal any touch events from any location.
        // from any location.
        if (!mIsExpanded || mShowingManage || mManageEducationView.getVisibility() == VISIBLE) {
        if (!mIsExpanded
                || mShowingManage
                || (mManageEducationView != null
                    && mManageEducationView.getVisibility() == VISIBLE)) {
            touchableRegion.setEmpty();
            touchableRegion.setEmpty();
        }
        }
    }
    }