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

Browse Source
This commit is contained in:
TreeHugger Robot
2020-06-09 20:48:43 +00:00
committed by Android (Google) Code Review
parent 8e11fb506e c12199f40e
commit c22af6e7fd
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) {
mStackView = new BubbleStackView(
mContext, mBubbleData, mSurfaceSynchronizer, mFloatingContentCoordinator,
mSysUiState, mNotificationShadeWindowController, this::onAllBubblesAnimatedOut,
mSysUiState, this::onAllBubblesAnimatedOut,
this::onImeVisibilityChanged);
mStackView.addView(mBubbleScrim);
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
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();
}
}