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

Commit d1a1de03 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... 

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

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

Change-Id: I96520c2a3597308c7e6f49d7bc97e09ce1bcf5f9
parents c107fa65 27a183b4

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();

        }

    }