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

Commit 9717bbbe 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: I71e462b01690940c3359532779e70e760e9280b0
parents 6667c5a5 907e00b2

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

+6 −3
Original line number Diff line number Diff line
@@ -1975,9 +1975,12 @@ public class BubbleStackView extends FrameLayout 
    @Override

    public void subtractObscuredTouchableRegion(Region touchableRegion, View view) {

        // 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

        // ActivityView steal any touch events from any location.

        if (!mIsExpanded || mShowingManage || mManageEducationView.getVisibility() == VISIBLE) {

        // manage bubbles user education, we shouldn't let the ActivityView steal any touch events

        // from any location.

        if (!mIsExpanded

                || mShowingManage

                || (mManageEducationView != null

                    && mManageEducationView.getVisibility() == VISIBLE)) {

            touchableRegion.setEmpty();

        }

    }