Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix obscured touchable region code." into rvc-dev am: c22af6e7fd am: a01e94e4ba am: 349159ed34

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

Change-Id: I00708412a5e3cc6af699203024b5ebc8f41225a1
This commit is contained in:
TreeHugger Robot
2020-06-09 21:31:01 +00:00
committed by Automerger Merge Worker
parent e11dbbd254 349159ed34
commit a42d2d779b
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java
View File

@@ -621,7 +621,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, mNotificationShadeWindowController, this::onAllBubblesAnimatedOut, mSysUiState, this::onAllBubblesAnimatedOut,
this::onImeVisibilityChanged); this::onImeVisibilityChanged);
mStackView.addView(mBubbleScrim); mStackView.addView(mBubbleScrim);
if (mExpandListener != null) { if (mExpandListener != null) {

6
packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java
View File

@@ -333,8 +333,6 @@ public class BubbleStackView extends FrameLayout
@NonNull @NonNull
private final SurfaceSynchronizer mSurfaceSynchronizer; private final SurfaceSynchronizer mSurfaceSynchronizer;
private final NotificationShadeWindowController mNotificationShadeWindowController;
/** /**
* Callback to run when the IME visibility changes - BubbleController uses this to update the * Callback to run when the IME visibility changes - BubbleController uses this to update the
* Bubbles window focusability flags with the WindowManager. * Bubbles window focusability flags with the WindowManager.
@@ -667,7 +665,6 @@ public class BubbleStackView extends FrameLayout
@Nullable SurfaceSynchronizer synchronizer, @Nullable SurfaceSynchronizer synchronizer,
FloatingContentCoordinator floatingContentCoordinator, FloatingContentCoordinator floatingContentCoordinator,
SysUiState sysUiState, SysUiState sysUiState,
NotificationShadeWindowController notificationShadeWindowController,
Runnable allBubblesAnimatedOutAction, Runnable allBubblesAnimatedOutAction,
Consumer<Boolean> onImeVisibilityChanged) { Consumer<Boolean> onImeVisibilityChanged) {
super(context); super(context);
@@ -676,7 +673,6 @@ public class BubbleStackView extends FrameLayout
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);
@@ -1786,7 +1782,7 @@ public class BubbleStackView extends FrameLayout
public void subtractObscuredTouchableRegion(Region touchableRegion, View view) { public void subtractObscuredTouchableRegion(Region touchableRegion, View view) {
// If the notification shade is expanded, or the manage menu is open, we shouldn't let the // 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. // ActivityView steal any touch events from any location.
if (mNotificationShadeWindowController.getPanelExpanded() || mShowingManage) { if (!mIsExpanded || mShowingManage) {
touchableRegion.setEmpty(); touchableRegion.setEmpty();
} }
} }