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

Commit a01e94e4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix obscured touchable region code." into rvc-dev am: c22af6e7 

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

Change-Id: Ib5b1ce200785ecdb1c6152af6eed0ae900c9162d
parents f9c91cf7 c22af6e7

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

+1 −1
Original line number Diff line number Diff line
@@ -621,7 +621,7 @@ public class BubbleController implements ConfigurationController.ConfigurationLi 
        if (mStackView == null) {

            mStackView = new BubbleStackView(

                    mContext, mBubbleData, mSurfaceSynchronizer, mFloatingContentCoordinator,

                    mSysUiState, mNotificationShadeWindowController, this::onAllBubblesAnimatedOut,

                    mSysUiState, this::onAllBubblesAnimatedOut,

                    this::onImeVisibilityChanged);

            mStackView.addView(mBubbleScrim);

            if (mExpandListener != null) {

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

+1 −5
Original line number Diff line number Diff line
@@ -333,8 +333,6 @@ public class BubbleStackView extends FrameLayout 
    @NonNull

    private final SurfaceSynchronizer mSurfaceSynchronizer;



    private final NotificationShadeWindowController mNotificationShadeWindowController;



    /**

     * Callback to run when the IME visibility changes - BubbleController uses this to update the

     * Bubbles window focusability flags with the WindowManager.
@@ -667,7 +665,6 @@ public class BubbleStackView extends FrameLayout 
            @Nullable SurfaceSynchronizer synchronizer,

            FloatingContentCoordinator floatingContentCoordinator,

            SysUiState sysUiState,

            NotificationShadeWindowController notificationShadeWindowController,

            Runnable allBubblesAnimatedOutAction,

            Consumer<Boolean> onImeVisibilityChanged) {

        super(context);
@@ -676,7 +673,6 @@ public class BubbleStackView extends FrameLayout 
        mInflater = LayoutInflater.from(context);



        mSysUiState = sysUiState;

        mNotificationShadeWindowController = notificationShadeWindowController;



        Resources res = getResources();

        mMaxBubbles = res.getInteger(R.integer.bubbles_max_rendered);
@@ -1786,7 +1782,7 @@ public class BubbleStackView extends FrameLayout 
    public void subtractObscuredTouchableRegion(Region touchableRegion, View view) {

        // If the notification shade is expanded, or the manage menu is open, we shouldn't let the

        // ActivityView steal any touch events from any location.

        if (mNotificationShadeWindowController.getPanelExpanded() || mShowingManage) {

        if (!mIsExpanded || mShowingManage) {

            touchableRegion.setEmpty();

        }

    }