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

Commit 9dfdb696 authored by Lucas Dupin's avatar Lucas Dupin Committed by Automerger Merge Worker
Browse files

Merge "Pause region sampling while blurring the shade" into sc-dev am: eb87d4ea am: 3aea34fc 

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

Change-Id: I31023a918152738aeaa44ec3faf98bdd6efb165c
parents 5a221c96 3aea34fc

packages/SystemUI/src/com/android/systemui/dagger/DependencyProvider.java

+3 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ import com.android.systemui.shared.system.TaskStackChangeListeners; 
import com.android.systemui.shared.system.WindowManagerWrapper;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.NotificationRemoteInputManager;

import com.android.systemui.statusbar.NotificationShadeDepthController;

import com.android.systemui.statusbar.phone.AutoHideController;

import com.android.systemui.statusbar.phone.ConfigurationControllerImpl;

import com.android.systemui.statusbar.phone.ShadeController;
@@ -229,6 +230,7 @@ public class DependencyProvider { 
            Lazy<StatusBar> statusBarLazy,

            ShadeController shadeController,

            NotificationRemoteInputManager notificationRemoteInputManager,

            NotificationShadeDepthController notificationShadeDepthController,

            SystemActions systemActions,

            @Main Handler mainHandler,

            UiEventLogger uiEventLogger,
@@ -257,6 +259,7 @@ public class DependencyProvider { 
                statusBarLazy,

                shadeController,

                notificationRemoteInputManager,

                notificationShadeDepthController,

                systemActions,

                mainHandler,

                uiEventLogger,

packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java

+25 −0
Original line number Diff line number Diff line
@@ -138,6 +138,7 @@ import com.android.systemui.statusbar.AutoHideUiElement; 
import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.CommandQueue.Callbacks;

import com.android.systemui.statusbar.NotificationRemoteInputManager;

import com.android.systemui.statusbar.NotificationShadeDepthController;

import com.android.systemui.statusbar.StatusBarState;

import com.android.systemui.statusbar.notification.stack.StackStateAnimator;

import com.android.systemui.statusbar.phone.AutoHideController;
@@ -201,6 +202,7 @@ public class NavigationBar implements View.OnAttachStateChangeListener, 
    private final UiEventLogger mUiEventLogger;

    private final NavigationBarA11yHelper mNavigationBarA11yHelper;

    private final UserTracker mUserTracker;

    private final NotificationShadeDepthController mNotificationShadeDepthController;



    private Bundle mSavedState;

    private NavigationBarView mNavigationBarView;
@@ -439,6 +441,25 @@ public class NavigationBar implements View.OnAttachStateChangeListener, 
                }

            };



    private final NotificationShadeDepthController.DepthListener mDepthListener =

            new NotificationShadeDepthController.DepthListener() {

                boolean mHasBlurs;



                @Override

                public void onWallpaperZoomOutChanged(float zoomOut) {

                }



                @Override

                public void onBlurRadiusChanged(int radius) {

                    boolean hasBlurs = radius != 0;

                    if (hasBlurs == mHasBlurs) {

                        return;

                    }

                    mHasBlurs = hasBlurs;

                    mNavigationBarView.setWindowHasBlurs(hasBlurs);

                }

            };



    public NavigationBar(Context context,

            WindowManager windowManager,

            Lazy<AssistManager> assistManagerLazy,
@@ -458,6 +479,7 @@ public class NavigationBar implements View.OnAttachStateChangeListener, 
            Optional<Recents> recentsOptional, Lazy<StatusBar> statusBarLazy,

            ShadeController shadeController,

            NotificationRemoteInputManager notificationRemoteInputManager,

            NotificationShadeDepthController notificationShadeDepthController,

            SystemActions systemActions,

            @Main Handler mainHandler,

            NavigationBarOverlayController navbarOverlayController,
@@ -489,6 +511,7 @@ public class NavigationBar implements View.OnAttachStateChangeListener, 
        mUiEventLogger = uiEventLogger;

        mNavigationBarA11yHelper = navigationBarA11yHelper;

        mUserTracker = userTracker;

        mNotificationShadeDepthController = notificationShadeDepthController;



        mNavBarMode = mNavigationModeController.addListener(this);

    }
@@ -554,6 +577,7 @@ public class NavigationBar implements View.OnAttachStateChangeListener, 


        mIsCurrentUserSetup = mDeviceProvisionedController.isCurrentUserSetup();

        mDeviceProvisionedController.addCallback(mUserSetupListener);

        mNotificationShadeDepthController.addListener(mDepthListener);



        setAccessibilityFloatingMenuModeIfNeeded();
@@ -569,6 +593,7 @@ public class NavigationBar implements View.OnAttachStateChangeListener, 
        mNavigationBarA11yHelper.removeA11yEventListener(mAccessibilityListener);

        mContentResolver.unregisterContentObserver(mAssistContentObserver);

        mDeviceProvisionedController.removeCallback(mUserSetupListener);

        mNotificationShadeDepthController.removeListener(mDepthListener);



        DeviceConfig.removeOnPropertiesChangedListener(mOnPropertiesChangedListener);

    }

packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarController.java

+5 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ import com.android.systemui.settings.UserTracker; 
import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.CommandQueue.Callbacks;

import com.android.systemui.statusbar.NotificationRemoteInputManager;

import com.android.systemui.statusbar.NotificationShadeDepthController;

import com.android.systemui.statusbar.phone.BarTransitions.TransitionMode;

import com.android.systemui.statusbar.phone.ShadeController;

import com.android.systemui.statusbar.phone.StatusBar;
@@ -115,6 +116,7 @@ public class NavigationBarController implements Callbacks, 
    private final DisplayManager mDisplayManager;

    private final NavigationBarOverlayController mNavBarOverlayController;

    private final TaskbarDelegate mTaskbarDelegate;

    private final NotificationShadeDepthController mNotificationShadeDepthController;

    private int mNavMode;

    private boolean mIsTablet;

    private final UserTracker mUserTracker;
@@ -149,6 +151,7 @@ public class NavigationBarController implements Callbacks, 
            Lazy<StatusBar> statusBarLazy,

            ShadeController shadeController,

            NotificationRemoteInputManager notificationRemoteInputManager,

            NotificationShadeDepthController notificationShadeDepthController,

            SystemActions systemActions,

            @Main Handler mainHandler,

            UiEventLogger uiEventLogger,
@@ -177,6 +180,7 @@ public class NavigationBarController implements Callbacks, 
        mStatusBarLazy = statusBarLazy;

        mShadeController = shadeController;

        mNotificationRemoteInputManager = notificationRemoteInputManager;

        mNotificationShadeDepthController = notificationShadeDepthController;

        mSystemActions = systemActions;

        mUiEventLogger = uiEventLogger;

        mHandler = mainHandler;
@@ -370,6 +374,7 @@ public class NavigationBarController implements Callbacks, 
                mStatusBarLazy,

                mShadeController,

                mNotificationRemoteInputManager,

                mNotificationShadeDepthController,

                mSystemActions,

                mHandler,

                mNavBarOverlayController,

packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java

+7 −0
Original line number Diff line number Diff line
@@ -413,6 +413,13 @@ public class NavigationBarView extends FrameLayout implements 
        return super.onTouchEvent(event);

    }



    /**

     * If we're blurring the shade window.

     */

    public void setWindowHasBlurs(boolean hasBlurs) {

        mRegionSamplingHelper.setWindowHasBlurs(hasBlurs);

    }



    void onTransientStateChanged(boolean isTransient) {

        mEdgeBackGestureHandler.onNavBarTransientStateChanged(isTransient);

packages/SystemUI/src/com/android/systemui/navigationbar/gestural/RegionSamplingHelper.java

+11 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ public class RegionSamplingHelper implements View.OnAttachStateChangeListener, 
    private final float mLuminanceChangeThreshold;

    private boolean mFirstSamplingAfterStart;

    private boolean mWindowVisible;

    private boolean mWindowHasBlurs;

    private SurfaceControl mRegisteredStopLayer = null;

    private ViewTreeObserver.OnDrawListener mUpdateOnDraw = new ViewTreeObserver.OnDrawListener() {

        @Override
@@ -153,6 +154,7 @@ public class RegionSamplingHelper implements View.OnAttachStateChangeListener, 
        boolean isSamplingEnabled = mSamplingEnabled

                && !mSamplingRequestBounds.isEmpty()

                && mWindowVisible

                && !mWindowHasBlurs

                && (mSampledView.isAttachedToWindow() || mFirstSamplingAfterStart);

        if (isSamplingEnabled) {

            ViewRootImpl viewRootImpl = mSampledView.getViewRootImpl();
@@ -225,6 +227,14 @@ public class RegionSamplingHelper implements View.OnAttachStateChangeListener, 
        updateSamplingListener();

    }



    /**

     * If we're blurring the shade window.

     */

    public void setWindowHasBlurs(boolean hasBlurs) {

        mWindowHasBlurs = hasBlurs;

        updateSamplingListener();

    }



    public void dump(PrintWriter pw) {

        pw.println("RegionSamplingHelper:");

        pw.println("  sampleView isAttached: " + mSampledView.isAttachedToWindow());
@@ -238,6 +248,7 @@ public class RegionSamplingHelper implements View.OnAttachStateChangeListener, 
        pw.println("  mLastMedianLuma: " + mLastMedianLuma);

        pw.println("  mCurrentMedianLuma: " + mCurrentMedianLuma);

        pw.println("  mWindowVisible: " + mWindowVisible);

        pw.println("  mWindowHasBlurs: " + mWindowHasBlurs);

        pw.println("  mWaitingOnDraw: " + mWaitingOnDraw);

        pw.println("  mRegisteredStopLayer: " + mRegisteredStopLayer);

        pw.println("  mIsDestroyed: " + mIsDestroyed);