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

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

Merge "Fix the ActivityView consuming shade touches." into rvc-dev am: 377e486c am: 7ae8282f 

Change-Id: I7cda3948a9a8c939b7dad9ca49735c8c839986ff
parents e4779be0 7ae8282f

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

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

        if (mStackView == null) {

            mStackView = new BubbleStackView(

            mStackView = new BubbleStackView(

                    mContext, mBubbleData, mSurfaceSynchronizer, mFloatingContentCoordinator,

                    mContext, mBubbleData, mSurfaceSynchronizer, mFloatingContentCoordinator,

                    mSysUiState);

                    mSysUiState, mNotificationShadeWindowController);

            ViewGroup nsv = mNotificationShadeWindowController.getNotificationShadeView();

            ViewGroup nsv = mNotificationShadeWindowController.getNotificationShadeView();

            int bubbleScrimIndex = nsv.indexOfChild(nsv.findViewById(R.id.scrim_for_bubble));

            int bubbleScrimIndex = nsv.indexOfChild(nsv.findViewById(R.id.scrim_for_bubble));

            int stackIndex = bubbleScrimIndex + 1;  // Show stack above bubble scrim.

            int stackIndex = bubbleScrimIndex + 1;  // Show stack above bubble scrim.

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

+11 −2
Original line number Original line Diff line number Diff line
@@ -83,6 +83,7 @@ import com.android.systemui.bubbles.animation.StackAnimationController; 
import com.android.systemui.model.SysUiState;

import com.android.systemui.model.SysUiState;

import com.android.systemui.shared.system.QuickStepContract;

import com.android.systemui.shared.system.QuickStepContract;

import com.android.systemui.shared.system.SysUiStatsLog;

import com.android.systemui.shared.system.SysUiStatsLog;

import com.android.systemui.statusbar.phone.NotificationShadeWindowController;

import com.android.systemui.util.DismissCircleView;

import com.android.systemui.util.DismissCircleView;

import com.android.systemui.util.FloatingContentCoordinator;

import com.android.systemui.util.FloatingContentCoordinator;

import com.android.systemui.util.RelativeTouchListener;

import com.android.systemui.util.RelativeTouchListener;
@@ -330,6 +331,8 @@ public class BubbleStackView extends FrameLayout { 
    @NonNull

    @NonNull

    private final SurfaceSynchronizer mSurfaceSynchronizer;

    private final SurfaceSynchronizer mSurfaceSynchronizer;





    private final NotificationShadeWindowController mNotificationShadeWindowController;



    /**

    /**

     * The currently magnetized object, which is being dragged and will be attracted to the magnetic

     * The currently magnetized object, which is being dragged and will be attracted to the magnetic

     * dismiss target.

     * dismiss target.
@@ -626,13 +629,15 @@ public class BubbleStackView extends FrameLayout { 
    public BubbleStackView(Context context, BubbleData data,

    public BubbleStackView(Context context, BubbleData data,

            @Nullable SurfaceSynchronizer synchronizer,

            @Nullable SurfaceSynchronizer synchronizer,

            FloatingContentCoordinator floatingContentCoordinator,

            FloatingContentCoordinator floatingContentCoordinator,

            SysUiState sysUiState) {

            SysUiState sysUiState,

            NotificationShadeWindowController notificationShadeWindowController) {

        super(context);

        super(context);





        mBubbleData = data;

        mBubbleData = data;

        mInflater = LayoutInflater.from(context);

        mInflater = LayoutInflater.from(context);





        mSysUiState = sysUiState;

        mSysUiState = sysUiState;

        mNotificationShadeWindowController = notificationShadeWindowController;





        Resources res = getResources();

        Resources res = getResources();

        mMaxBubbles = res.getInteger(R.integer.bubbles_max_rendered);

        mMaxBubbles = res.getInteger(R.integer.bubbles_max_rendered);
@@ -1557,7 +1562,11 @@ 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, we shouldn't let the ActivityView steal any touch

        // events from any location.

        if (mNotificationShadeWindowController.getPanelExpanded()) {

            touchableRegion.setEmpty();

        }

    }

    }





    /**

    /**