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

Commit 887d340e authored by Milton Wu's avatar Milton Wu
Browse files

Group window relayout requests 

Various places in sysui might call into
NotificationShadeWindowController. Some of these calls can lead to
relayoutWindow(), which is quite expensive.

We should group these calls, and execute them in batch.

Test: manual
Test: perfetto trace
Test: atest NotificationPanelViewControllerTest
Test: atest NotificationShadeWindowControllerImplTest
Fixes: 190382751
Bug: 210432290
Change-Id: Ib08f7ba66048eb023ee2d5e9c09461381c390f0d
Merged-In: Ib08f7ba66048eb023ee2d5e9c09461381c390f0d
parent d7d3c2d9

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+18 −9
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ import com.android.systemui.plugins.statusbar.StatusBarStateController; 
import com.android.systemui.shared.system.QuickStepContract;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.NotificationShadeDepthController;

import com.android.systemui.statusbar.NotificationShadeWindowController;

import com.android.systemui.statusbar.SysuiStatusBarStateController;

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

import com.android.systemui.statusbar.phone.DozeParameters;
@@ -324,6 +325,7 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable, 
    // the properties of the keyguard



    private final KeyguardUpdateMonitor mUpdateMonitor;

    private final Lazy<NotificationShadeWindowController> mNotificationShadeWindowControllerLazy;



    /**

     * Last SIM state reported by the telephony system.
@@ -846,7 +848,8 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable, 
            KeyguardStateController keyguardStateController,

            Lazy<KeyguardUnlockAnimationController> keyguardUnlockAnimationControllerLazy,

            UnlockedScreenOffAnimationController unlockedScreenOffAnimationController,

            Lazy<NotificationShadeDepthController> notificationShadeDepthController) {

            Lazy<NotificationShadeDepthController> notificationShadeDepthController,

            Lazy<NotificationShadeWindowController> notificationShadeWindowControllerLazy) {

        super(context);

        mFalsingCollector = falsingCollector;

        mLockPatternUtils = lockPatternUtils;
@@ -862,6 +865,7 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable, 
        mKeyguardDisplayManager = keyguardDisplayManager;

        dumpManager.registerDumpable(getClass().getName(), this);

        mDeviceConfig = deviceConfig;

        mNotificationShadeWindowControllerLazy = notificationShadeWindowControllerLazy;

        mShowHomeOverLockscreen = mDeviceConfig.getBoolean(

                DeviceConfig.NAMESPACE_SYSTEMUI,

                NAV_BAR_HANDLE_SHOW_OVER_LOCKSCREEN,
@@ -1889,10 +1893,13 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable, 
                    Trace.beginSection(

                            "KeyguardViewMediator#handleMessage START_KEYGUARD_EXIT_ANIM");

                    StartKeyguardExitAnimParams params = (StartKeyguardExitAnimParams) msg.obj;

                    handleStartKeyguardExitAnimation(params.startTime, params.fadeoutDuration,

                            params.mApps, params.mWallpapers, params.mNonApps,

                            params.mFinishedCallback);

                    mNotificationShadeWindowControllerLazy.get().batchApplyWindowLayoutParams(

                            () -> {

                                handleStartKeyguardExitAnimation(params.startTime,

                                        params.fadeoutDuration, params.mApps, params.mWallpapers,

                                        params.mNonApps, params.mFinishedCallback);

                                mFalsingCollector.onSuccessfulUnlock();

                            });

                    Trace.endSection();

                    break;

                case CANCEL_KEYGUARD_EXIT_ANIM:
@@ -2190,10 +2197,12 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable, 
                mKeyguardGoingAwayRunnable.run();

            } else {

                // TODO(bc-unlock): Fill parameters

                mNotificationShadeWindowControllerLazy.get().batchApplyWindowLayoutParams(() -> {

                    handleStartKeyguardExitAnimation(

                            SystemClock.uptimeMillis() + mHideAnimation.getStartOffset(),

                            mHideAnimation.getDuration(), null /* apps */, null /* wallpapers */,

                            null /* nonApps */, null /* finishedCallback */);

                });

            }

        }

        Trace.endSection();

packages/SystemUI/src/com/android/systemui/keyguard/dagger/KeyguardModule.java

+5 −2
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ import com.android.systemui.keyguard.KeyguardViewMediator; 
import com.android.systemui.navigationbar.NavigationModeController;

import com.android.systemui.plugins.statusbar.StatusBarStateController;

import com.android.systemui.statusbar.NotificationShadeDepthController;

import com.android.systemui.statusbar.NotificationShadeWindowController;

import com.android.systemui.statusbar.SysuiStatusBarStateController;

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

import com.android.systemui.statusbar.phone.KeyguardLiftController;
@@ -97,7 +98,8 @@ public class KeyguardModule { 
            KeyguardStateController keyguardStateController,

            Lazy<KeyguardUnlockAnimationController> keyguardUnlockAnimationController,

            UnlockedScreenOffAnimationController unlockedScreenOffAnimationController,

            Lazy<NotificationShadeDepthController> notificationShadeDepthController) {

            Lazy<NotificationShadeDepthController> notificationShadeDepthController,

            Lazy<NotificationShadeWindowController> notificationShadeWindowController) {

        return new KeyguardViewMediator(

                context,

                falsingCollector,
@@ -120,7 +122,8 @@ public class KeyguardModule { 
                keyguardStateController,

                keyguardUnlockAnimationController,

                unlockedScreenOffAnimationController,

                notificationShadeDepthController

                notificationShadeDepthController,

                notificationShadeWindowController

        );

    }

packages/SystemUI/src/com/android/systemui/statusbar/NotificationShadeWindowController.java

+9 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.systemui.statusbar; 


import android.view.ViewGroup;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;



import com.android.systemui.statusbar.phone.StatusBarWindowCallback;
@@ -187,6 +188,14 @@ public interface NotificationShadeWindowController extends RemoteInputController 
     */

    default void setLightRevealScrimOpaque(boolean opaque) {}



    /**

     * Defer any application of window {@link WindowManager.LayoutParams} until {@code scope} is

     * fully applied.

     */

    default void batchApplyWindowLayoutParams(@NonNull Runnable scope) {

        scope.run();

    }



    /**

     * Custom listener to pipe data back to plugins about whether or not the status bar would be

     * collapsed if not for the plugin.

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

+5 −1
Original line number Diff line number Diff line
@@ -145,6 +145,7 @@ import com.android.systemui.statusbar.LockscreenShadeTransitionController; 
import com.android.systemui.statusbar.NotificationLockscreenUserManager;

import com.android.systemui.statusbar.NotificationRemoteInputManager;

import com.android.systemui.statusbar.NotificationShadeDepthController;

import com.android.systemui.statusbar.NotificationShadeWindowController;

import com.android.systemui.statusbar.NotificationShelfController;

import com.android.systemui.statusbar.PulseExpansionHandler;

import com.android.systemui.statusbar.RemoteInputController;
@@ -664,7 +665,9 @@ public class NotificationPanelViewController extends PanelViewController { 
            NotificationLockscreenUserManager notificationLockscreenUserManager,

            NotificationEntryManager notificationEntryManager,

            KeyguardStateController keyguardStateController,

            StatusBarStateController statusBarStateController, DozeLog dozeLog,

            StatusBarStateController statusBarStateController,

            NotificationShadeWindowController notificationShadeWindowController,

            DozeLog dozeLog,

            DozeParameters dozeParameters, CommandQueue commandQueue, VibratorHelper vibratorHelper,

            LatencyTracker latencyTracker, PowerManager powerManager,

            AccessibilityManager accessibilityManager, @DisplayId int displayId,
@@ -716,6 +719,7 @@ public class NotificationPanelViewController extends PanelViewController { 
                dozeLog,

                keyguardStateController,

                (SysuiStatusBarStateController) statusBarStateController,

                notificationShadeWindowController,

                vibratorHelper,

                statusBarKeyguardViewManager,

                latencyTracker,

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

+23 −3
Original line number Diff line number Diff line
@@ -107,6 +107,12 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW 
    private final SysuiColorExtractor mColorExtractor;

    private final UnlockedScreenOffAnimationController mUnlockedScreenOffAnimationController;

    private float mFaceAuthDisplayBrightness = LayoutParams.BRIGHTNESS_OVERRIDE_NONE;

    /**

     * Layout params would be aggregated and dispatched all at once if this is > 0.

     *

     * @see #batchApplyWindowLayoutParams(Runnable)

     */

    private int mDeferWindowLayoutParams;



    @Inject

    public NotificationShadeWindowControllerImpl(Context context, WindowManager windowManager,
@@ -433,6 +439,20 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW 
        }

    }



    private void applyWindowLayoutParams() {

        if (mDeferWindowLayoutParams == 0 && mLp != null && mLp.copyFrom(mLpChanged) != 0) {

            mWindowManager.updateViewLayout(mNotificationShadeView, mLp);

        }

    }



    @Override

    public void batchApplyWindowLayoutParams(Runnable scope) {

        mDeferWindowLayoutParams++;

        scope.run();

        mDeferWindowLayoutParams--;

        applyWindowLayoutParams();

    }



    private void apply(State state) {

        applyKeyguardFlags(state);

        applyFocusableFlag(state);
@@ -447,9 +467,8 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW 
        applyHasTopUi(state);

        applyNotTouchable(state);

        applyStatusBarColorSpaceAgnosticFlag(state);

        if (mLp != null && mLp.copyFrom(mLpChanged) != 0) {

            mWindowManager.updateViewLayout(mNotificationShadeView, mLp);

        }

        applyWindowLayoutParams();



        if (mHasTopUi != mHasTopUiChanged) {

            whitelistIpcs(() -> {

                try {
@@ -722,6 +741,7 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW 
        pw.println(TAG + ":");

        pw.println("  mKeyguardMaxRefreshRate=" + mKeyguardMaxRefreshRate);

        pw.println("  mKeyguardPreferredRefreshRate=" + mKeyguardPreferredRefreshRate);

        pw.println("  mDeferWindowLayoutParams=" + mDeferWindowLayoutParams);

        pw.println(mCurrentState);

        if (mNotificationShadeView != null && mNotificationShadeView.getViewRootImpl() != null) {

            mNotificationShadeView.getViewRootImpl().dump("  ", pw);