Merge "Fix the ActivityView consuming shade touches." into rvc-dev am:... (05b2f5be) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -599,7 +599,7 @@ public class BubbleController implements ConfigurationController.ConfigurationLi
		if (mStackView == null) {
		mStackView = new BubbleStackView(
		mContext, mBubbleData, mSurfaceSynchronizer, mFloatingContentCoordinator,
		mSysUiState);
		mSysUiState, mNotificationShadeWindowController);
		ViewGroup nsv = mNotificationShadeWindowController.getNotificationShadeView();
		int bubbleScrimIndex = nsv.indexOfChild(nsv.findViewById(R.id.scrim_for_bubble));
		int stackIndex = bubbleScrimIndex + 1; // Show stack above bubble scrim.

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

+11 −2

Original line number	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.shared.system.QuickStepContract;
		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.FloatingContentCoordinator;
		import com.android.systemui.util.RelativeTouchListener;
		@@ -330,6 +331,8 @@ public class BubbleStackView extends FrameLayout {
		@NonNull
		private final SurfaceSynchronizer mSurfaceSynchronizer;

		private final NotificationShadeWindowController mNotificationShadeWindowController;

		/**
		* The currently magnetized object, which is being dragged and will be attracted to the magnetic
		* dismiss target.
		@@ -626,13 +629,15 @@ public class BubbleStackView extends FrameLayout {
		public BubbleStackView(Context context, BubbleData data,
		@Nullable SurfaceSynchronizer synchronizer,
		FloatingContentCoordinator floatingContentCoordinator,
		SysUiState sysUiState) {
		SysUiState sysUiState,
		NotificationShadeWindowController notificationShadeWindowController) {
		super(context);

		mBubbleData = data;
		mInflater = LayoutInflater.from(context);

		mSysUiState = sysUiState;
		mNotificationShadeWindowController = notificationShadeWindowController;

		Resources res = getResources();
		mMaxBubbles = res.getInteger(R.integer.bubbles_max_rendered);
		@@ -1557,7 +1562,11 @@ public class BubbleStackView extends FrameLayout {
		*/
		@Override
		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();
		}
		}

		/**