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

Merge "Fix tapping on dreams to dismiss."

Browse Source
This commit is contained in:
William Leshner
2021-12-14 04:49:15 +00:00
committed by Android (Google) Code Review
parent 9014bfd74d fd056f8c17
commit ca71099fb7
2 changed files with 54 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayService.java
View File

@@ -63,50 +63,52 @@ public class DreamOverlayService extends android.service.dreams.DreamOverlayServ
private final DreamOverlayStateController.Callback mOverlayStateCallback =
new DreamOverlayStateController.Callback() {
@Override
public void onOverlayChanged() {
mExecutor.execute(() -> reloadOverlaysLocked());
}
};
@Override
public void onOverlayChanged() {
mExecutor.execute(() -> reloadOverlaysLocked());
}
};
// The service listens to view changes in order to declare that input occurring in areas outside
// the overlay should be passed through to the dream underneath.
private View.OnAttachStateChangeListener mRootViewAttachListener =
private final View.OnAttachStateChangeListener mRootViewAttachListener =
new View.OnAttachStateChangeListener() {
@Override
public void onViewAttachedToWindow(View v) {
v.getViewTreeObserver()
.addOnComputeInternalInsetsListener(mOnComputeInternalInsetsListener);
}
@Override
public void onViewAttachedToWindow(View v) {
v.getViewTreeObserver()
.addOnComputeInternalInsetsListener(mOnComputeInternalInsetsListener);
}
@Override
public void onViewDetachedFromWindow(View v) {
v.getViewTreeObserver()
.removeOnComputeInternalInsetsListener(mOnComputeInternalInsetsListener);
}
};
@Override
public void onViewDetachedFromWindow(View v) {
v.getViewTreeObserver()
.removeOnComputeInternalInsetsListener(
mOnComputeInternalInsetsListener);
}
};
// A hook into the internal inset calculation where we declare the overlays as the only
// touchable regions.
private ViewTreeObserver.OnComputeInternalInsetsListener mOnComputeInternalInsetsListener =
private final ViewTreeObserver.OnComputeInternalInsetsListener
mOnComputeInternalInsetsListener =
new ViewTreeObserver.OnComputeInternalInsetsListener() {
@Override
public void onComputeInternalInsets(ViewTreeObserver.InternalInsetsInfo inoutInfo) {
if (mDreamOverlayContentView != null) {
inoutInfo.setTouchableInsets(
ViewTreeObserver.InternalInsetsInfo.TOUCHABLE_INSETS_REGION);
final Region region = new Region();
for (int i = 0; i < mDreamOverlayContentView.getChildCount(); i++) {
View child = mDreamOverlayContentView.getChildAt(i);
final Rect rect = new Rect();
child.getGlobalVisibleRect(rect);
region.op(rect, Region.Op.UNION);
}
@Override
public void onComputeInternalInsets(ViewTreeObserver.InternalInsetsInfo inoutInfo) {
if (mDreamOverlayContentView != null) {
inoutInfo.setTouchableInsets(
ViewTreeObserver.InternalInsetsInfo.TOUCHABLE_INSETS_REGION);
final Region region = new Region();
for (int i = 0; i < mDreamOverlayContentView.getChildCount(); i++) {
View child = mDreamOverlayContentView.getChildAt(i);
final Rect rect = new Rect();
child.getGlobalVisibleRect(rect);
region.op(rect, Region.Op.UNION);
}
inoutInfo.touchableRegion.set(region);
}
}
};
inoutInfo.touchableRegion.set(region);
}
}
};
@Inject
public DreamOverlayService(
@@ -163,7 +165,9 @@ public class DreamOverlayService extends android.service.dreams.DreamOverlayServ
}
window.setContentView(mDreamOverlayComponent.getDreamOverlayContainerView());
mDreamOverlayContentView = mDreamOverlayComponent.getDreamOverlayContentView();
mDreamOverlayContentView.addOnAttachStateChangeListener(mRootViewAttachListener);
mDreamOverlayComponent.getDreamOverlayStatusBarViewController().init();

16
packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayServiceTest.java
View File

@@ -191,4 +191,20 @@ public class DreamOverlayServiceTest extends SysuiTestCase {
verify(mDreamOverlayStatusBarViewController).init();
}
@Test
public void testRootViewAttachListenerIsAddedToDreamOverlayContentView() throws Exception {
final DreamOverlayService service = new DreamOverlayService(mContext, mMainExecutor,
mDreamOverlayStateController, mDreamOverlayStatusBarViewComponentFactory);
final IBinder proxy = service.onBind(new Intent());
final IDreamOverlay overlay = IDreamOverlay.Stub.asInterface(proxy);
// Inform the overlay service of dream starting.
overlay.startDream(mWindowParams, mDreamOverlayCallback);
mMainExecutor.runAllReady();
verify(mDreamOverlayContentView).addOnAttachStateChangeListener(
any(View.OnAttachStateChangeListener.class));
}
}