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

Commit bd9453c6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[SceneContainer] Fix touchable area when a HUN is displayed" into main

parents b25d0874 286af4bb

packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpManagerPhone.java

+1 −0
Original line number Diff line number Diff line
@@ -202,6 +202,7 @@ public class HeadsUpManagerPhone extends BaseHeadsUpManager implements 
     * Gets the touchable region needed for heads up notifications. Returns null if no touchable

     * region is required (ie: no heads up notification currently exists).

     */

    // TODO(b/347007367): With scene container enabled this method may report outdated regions

    @Override

    public @Nullable Region getTouchableRegion() {

        NotificationEntry topEntry = getTopEntry();

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarTouchableRegionManager.java

+11 −10
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import android.view.ViewTreeObserver; 
import android.view.ViewTreeObserver.OnComputeInternalInsetsListener;

import android.view.WindowInsets;



import com.android.compose.animation.scene.ObservableTransitionState;

import com.android.internal.policy.SystemBarUtils;

import com.android.systemui.Dumpable;

import com.android.systemui.ScreenDecorations;
@@ -38,7 +39,7 @@ import com.android.systemui.dagger.SysUISingleton; 
import com.android.systemui.res.R;

import com.android.systemui.scene.domain.interactor.SceneInteractor;

import com.android.systemui.scene.shared.flag.SceneContainerFlag;

import com.android.systemui.shade.ShadeExpansionStateManager;

import com.android.systemui.scene.shared.model.Scenes;

import com.android.systemui.shade.domain.interactor.ShadeInteractor;

import com.android.systemui.statusbar.NotificationShadeWindowController;

import com.android.systemui.statusbar.policy.ConfigurationController;
@@ -67,7 +68,7 @@ public final class StatusBarTouchableRegionManager implements Dumpable { 
    private final UnlockedScreenOffAnimationController mUnlockedScreenOffAnimationController;



    private boolean mIsStatusBarExpanded = false;

    private boolean mIsSceneContainerVisible = false;

    private boolean mIsIdleOnGone = false;

    private boolean mShouldAdjustInsets = false;

    private View mNotificationShadeWindowView;

    private View mNotificationPanelView;
@@ -87,7 +88,6 @@ public final class StatusBarTouchableRegionManager implements Dumpable { 
            NotificationShadeWindowController notificationShadeWindowController,

            ConfigurationController configurationController,

            HeadsUpManager headsUpManager,

            ShadeExpansionStateManager shadeExpansionStateManager,

            ShadeInteractor shadeInteractor,

            Provider<SceneInteractor> sceneInteractor,

            JavaAdapter javaAdapter,
@@ -131,8 +131,8 @@ public final class StatusBarTouchableRegionManager implements Dumpable { 


        if (SceneContainerFlag.isEnabled()) {

            javaAdapter.alwaysCollectFlow(

                    sceneInteractor.get().isVisible(),

                    this::onSceneContainerVisibilityChanged);

                    sceneInteractor.get().getTransitionState(),

                    this::onSceneChanged);

        } else {

            javaAdapter.alwaysCollectFlow(

                    shadeInteractor.isAnyExpanded(),
@@ -167,10 +167,11 @@ public final class StatusBarTouchableRegionManager implements Dumpable { 
        }

    }



    private void onSceneContainerVisibilityChanged(Boolean isVisible) {

        if (isVisible != mIsSceneContainerVisible) {

            mIsSceneContainerVisible = isVisible;

            if (isVisible) {

    private void onSceneChanged(ObservableTransitionState transitionState) {

        boolean isIdleOnGone = transitionState.isIdle(Scenes.Gone);

        if (isIdleOnGone != mIsIdleOnGone) {

            mIsIdleOnGone = isIdleOnGone;

            if (!isIdleOnGone) {

                // make sure our state is sensible

                mForceCollapsedUntilLayout = false;

            }
@@ -281,7 +282,7 @@ public final class StatusBarTouchableRegionManager implements Dumpable { 
        // since we don't want stray touches to go through the light reveal scrim to whatever is

        // underneath.

        return mIsStatusBarExpanded

                || mIsSceneContainerVisible

                || !mIsIdleOnGone

                || mPrimaryBouncerInteractor.isShowing().getValue()

                || mAlternateBouncerInteractor.isVisibleState()

                || mUnlockedScreenOffAnimationController.isAnimationPlaying();