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

Commit 60c730b6 authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

Merge "Fix boot timeout and reduce boot time" into rvc-dev am: 2d695313 

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

Change-Id: I4c24f27c4c182ecc0add98ff64bce4a84df130de
parents c8c43b25 2d695313

packages/CarSystemUI/src/com/android/systemui/car/statusbar/DummyNotificationShadeWindowController.java

+4 −1
Original line number Original line Diff line number Diff line
@@ -23,6 +23,7 @@ import android.view.WindowManager; 
import com.android.systemui.car.window.SystemUIOverlayWindowController;

import com.android.systemui.car.window.SystemUIOverlayWindowController;

import com.android.systemui.colorextraction.SysuiColorExtractor;

import com.android.systemui.colorextraction.SysuiColorExtractor;

import com.android.systemui.dump.DumpManager;

import com.android.systemui.dump.DumpManager;

import com.android.systemui.keyguard.KeyguardViewMediator;

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

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

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

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

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

import com.android.systemui.statusbar.phone.DozeParameters;
@@ -49,12 +50,14 @@ public class DummyNotificationShadeWindowController extends NotificationShadeWin 
            DozeParameters dozeParameters,

            DozeParameters dozeParameters,

            StatusBarStateController statusBarStateController,

            StatusBarStateController statusBarStateController,

            ConfigurationController configurationController,

            ConfigurationController configurationController,

            KeyguardViewMediator keyguardViewMediator,

            KeyguardBypassController keyguardBypassController,

            KeyguardBypassController keyguardBypassController,

            SysuiColorExtractor colorExtractor,

            SysuiColorExtractor colorExtractor,

            DumpManager dumpManager,

            DumpManager dumpManager,

            SystemUIOverlayWindowController overlayWindowController) {

            SystemUIOverlayWindowController overlayWindowController) {

        super(context, windowManager, activityManager, dozeParameters, statusBarStateController,

        super(context, windowManager, activityManager, dozeParameters, statusBarStateController,

                configurationController, keyguardBypassController, colorExtractor, dumpManager);

                configurationController, keyguardViewMediator, keyguardBypassController,

                colorExtractor, dumpManager);

        mOverlayWindowController = overlayWindowController;

        mOverlayWindowController = overlayWindowController;

    }

    }

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

+8 −0
Original line number Original line Diff line number Diff line
@@ -84,6 +84,7 @@ public class NotificationShadeWindowController implements Callback, Dumpable, 
    private final boolean mKeyguardScreenRotation;

    private final boolean mKeyguardScreenRotation;

    private final long mLockScreenDisplayTimeout;

    private final long mLockScreenDisplayTimeout;

    private final Display.Mode mKeyguardDisplayMode;

    private final Display.Mode mKeyguardDisplayMode;

    private final KeyguardViewMediator mKeyguardViewMediator;

    private final KeyguardBypassController mKeyguardBypassController;

    private final KeyguardBypassController mKeyguardBypassController;

    private ViewGroup mNotificationShadeView;

    private ViewGroup mNotificationShadeView;

    private LayoutParams mLp;

    private LayoutParams mLp;
@@ -104,6 +105,7 @@ public class NotificationShadeWindowController implements Callback, Dumpable, 
            IActivityManager activityManager, DozeParameters dozeParameters,

            IActivityManager activityManager, DozeParameters dozeParameters,

            StatusBarStateController statusBarStateController,

            StatusBarStateController statusBarStateController,

            ConfigurationController configurationController,

            ConfigurationController configurationController,

            KeyguardViewMediator keyguardViewMediator,

            KeyguardBypassController keyguardBypassController, SysuiColorExtractor colorExtractor,

            KeyguardBypassController keyguardBypassController, SysuiColorExtractor colorExtractor,

            DumpManager dumpManager) {

            DumpManager dumpManager) {

        mContext = context;

        mContext = context;
@@ -113,6 +115,7 @@ public class NotificationShadeWindowController implements Callback, Dumpable, 
        mDozeParameters = dozeParameters;

        mDozeParameters = dozeParameters;

        mScreenBrightnessDoze = mDozeParameters.getScreenBrightnessDoze();

        mScreenBrightnessDoze = mDozeParameters.getScreenBrightnessDoze();

        mLpChanged = new LayoutParams();

        mLpChanged = new LayoutParams();

        mKeyguardViewMediator = keyguardViewMediator;

        mKeyguardBypassController = keyguardBypassController;

        mKeyguardBypassController = keyguardBypassController;

        mColorExtractor = colorExtractor;

        mColorExtractor = colorExtractor;

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

        dumpManager.registerDumpable(getClass().getName(), this);
@@ -202,6 +205,11 @@ public class NotificationShadeWindowController implements Callback, Dumpable, 
        mWindowManager.addView(mNotificationShadeView, mLp);

        mWindowManager.addView(mNotificationShadeView, mLp);

        mLpChanged.copyFrom(mLp);

        mLpChanged.copyFrom(mLp);

        onThemeChanged();

        onThemeChanged();



        // Make the state consistent with KeyguardViewMediator#setupLocked during initialization.

        if (mKeyguardViewMediator.isShowingAndNotOccluded()) {

            setKeyguardShowing(true);

        }

    }

    }





    public void setNotificationShadeView(ViewGroup view) {

    public void setNotificationShadeView(ViewGroup view) {

packages/SystemUI/tests/src/com/android/systemui/bubbles/BubbleControllerTest.java

+5 −2
Original line number Original line Diff line number Diff line
@@ -63,6 +63,7 @@ import com.android.internal.statusbar.IStatusBarService; 
import com.android.systemui.SysuiTestCase;

import com.android.systemui.SysuiTestCase;

import com.android.systemui.colorextraction.SysuiColorExtractor;

import com.android.systemui.colorextraction.SysuiColorExtractor;

import com.android.systemui.dump.DumpManager;

import com.android.systemui.dump.DumpManager;

import com.android.systemui.keyguard.KeyguardViewMediator;

import com.android.systemui.model.SysUiState;

import com.android.systemui.model.SysUiState;

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

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

import com.android.systemui.shared.system.QuickStepContract;

import com.android.systemui.shared.system.QuickStepContract;
@@ -135,6 +136,8 @@ public class BubbleControllerTest extends SysuiTestCase { 
    @Mock

    @Mock

    private SysuiStatusBarStateController mStatusBarStateController;

    private SysuiStatusBarStateController mStatusBarStateController;

    @Mock

    @Mock

    private KeyguardViewMediator mKeyguardViewMediator;

    @Mock

    private KeyguardBypassController mKeyguardBypassController;

    private KeyguardBypassController mKeyguardBypassController;

    @Mock

    @Mock

    private FloatingContentCoordinator mFloatingContentCoordinator;

    private FloatingContentCoordinator mFloatingContentCoordinator;
@@ -198,8 +201,8 @@ public class BubbleControllerTest extends SysuiTestCase { 




        mNotificationShadeWindowController = new NotificationShadeWindowController(mContext,

        mNotificationShadeWindowController = new NotificationShadeWindowController(mContext,

                mWindowManager, mActivityManager, mDozeParameters, mStatusBarStateController,

                mWindowManager, mActivityManager, mDozeParameters, mStatusBarStateController,

                mConfigurationController, mKeyguardBypassController, mColorExtractor,

                mConfigurationController, mKeyguardViewMediator, mKeyguardBypassController,

                mDumpManager);

                mColorExtractor, mDumpManager);

        mNotificationShadeWindowController.setNotificationShadeView(mNotificationShadeWindowView);

        mNotificationShadeWindowController.setNotificationShadeView(mNotificationShadeWindowView);

        mNotificationShadeWindowController.attach();

        mNotificationShadeWindowController.attach();

packages/SystemUI/tests/src/com/android/systemui/bubbles/NewNotifPipelineBubbleControllerTest.java

+5 −2
Original line number Original line Diff line number Diff line
@@ -60,6 +60,7 @@ import com.android.internal.statusbar.IStatusBarService; 
import com.android.systemui.SysuiTestCase;

import com.android.systemui.SysuiTestCase;

import com.android.systemui.colorextraction.SysuiColorExtractor;

import com.android.systemui.colorextraction.SysuiColorExtractor;

import com.android.systemui.dump.DumpManager;

import com.android.systemui.dump.DumpManager;

import com.android.systemui.keyguard.KeyguardViewMediator;

import com.android.systemui.model.SysUiState;

import com.android.systemui.model.SysUiState;

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

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

import com.android.systemui.statusbar.FeatureFlags;

import com.android.systemui.statusbar.FeatureFlags;
@@ -132,6 +133,8 @@ public class NewNotifPipelineBubbleControllerTest extends SysuiTestCase { 
    @Mock

    @Mock

    private SysuiStatusBarStateController mStatusBarStateController;

    private SysuiStatusBarStateController mStatusBarStateController;

    @Mock

    @Mock

    private KeyguardViewMediator mKeyguardViewMediator;

    @Mock

    private KeyguardBypassController mKeyguardBypassController;

    private KeyguardBypassController mKeyguardBypassController;

    @Mock

    @Mock

    private FloatingContentCoordinator mFloatingContentCoordinator;

    private FloatingContentCoordinator mFloatingContentCoordinator;
@@ -194,8 +197,8 @@ public class NewNotifPipelineBubbleControllerTest extends SysuiTestCase { 
        // Bubbles get added to status bar window view

        // Bubbles get added to status bar window view

        mNotificationShadeWindowController = new NotificationShadeWindowController(mContext,

        mNotificationShadeWindowController = new NotificationShadeWindowController(mContext,

                mWindowManager, mActivityManager, mDozeParameters, mStatusBarStateController,

                mWindowManager, mActivityManager, mDozeParameters, mStatusBarStateController,

                mConfigurationController, mKeyguardBypassController, mColorExtractor,

                mConfigurationController, mKeyguardViewMediator, mKeyguardBypassController,

                mDumpManager);

                mColorExtractor, mDumpManager);

        mNotificationShadeWindowController.setNotificationShadeView(mNotificationShadeWindowView);

        mNotificationShadeWindowController.setNotificationShadeView(mNotificationShadeWindowView);

        mNotificationShadeWindowController.attach();

        mNotificationShadeWindowController.attach();

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationShadeWindowControllerTest.java

+16 −2
Original line number Original line Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.systemui.statusbar.phone; 




import static android.view.WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM;

import static android.view.WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM;

import static android.view.WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;

import static android.view.WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;

import static android.view.WindowManager.LayoutParams.FLAG_SHOW_WALLPAPER;





import static com.google.common.truth.Truth.assertThat;

import static com.google.common.truth.Truth.assertThat;
@@ -41,6 +42,7 @@ import com.android.internal.colorextraction.ColorExtractor; 
import com.android.systemui.SysuiTestCase;

import com.android.systemui.SysuiTestCase;

import com.android.systemui.colorextraction.SysuiColorExtractor;

import com.android.systemui.colorextraction.SysuiColorExtractor;

import com.android.systemui.dump.DumpManager;

import com.android.systemui.dump.DumpManager;

import com.android.systemui.keyguard.KeyguardViewMediator;

import com.android.systemui.statusbar.SysuiStatusBarStateController;

import com.android.systemui.statusbar.SysuiStatusBarStateController;

import com.android.systemui.statusbar.policy.ConfigurationController;

import com.android.systemui.statusbar.policy.ConfigurationController;
@@ -63,6 +65,7 @@ public class NotificationShadeWindowControllerTest extends SysuiTestCase { 
    @Mock private IActivityManager mActivityManager;

    @Mock private IActivityManager mActivityManager;

    @Mock private SysuiStatusBarStateController mStatusBarStateController;

    @Mock private SysuiStatusBarStateController mStatusBarStateController;

    @Mock private ConfigurationController mConfigurationController;

    @Mock private ConfigurationController mConfigurationController;

    @Mock private KeyguardViewMediator mKeyguardViewMediator;

    @Mock private KeyguardBypassController mKeyguardBypassController;

    @Mock private KeyguardBypassController mKeyguardBypassController;

    @Mock private SysuiColorExtractor mColorExtractor;

    @Mock private SysuiColorExtractor mColorExtractor;

    @Mock ColorExtractor.GradientColors mGradientColors;

    @Mock ColorExtractor.GradientColors mGradientColors;
@@ -79,8 +82,8 @@ public class NotificationShadeWindowControllerTest extends SysuiTestCase { 




        mNotificationShadeWindowController = new NotificationShadeWindowController(mContext,

        mNotificationShadeWindowController = new NotificationShadeWindowController(mContext,

                mWindowManager, mActivityManager, mDozeParameters, mStatusBarStateController,

                mWindowManager, mActivityManager, mDozeParameters, mStatusBarStateController,

                mConfigurationController, mKeyguardBypassController, mColorExtractor,

                mConfigurationController, mKeyguardViewMediator, mKeyguardBypassController,

                mDumpManager);

                mColorExtractor, mDumpManager);

        mNotificationShadeWindowController.setNotificationShadeView(mNotificationShadeWindowView);

        mNotificationShadeWindowController.setNotificationShadeView(mNotificationShadeWindowView);





        mNotificationShadeWindowController.attach();

        mNotificationShadeWindowController.attach();
@@ -119,6 +122,17 @@ public class NotificationShadeWindowControllerTest extends SysuiTestCase { 
        mNotificationShadeWindowController.setForcePluginOpen(true);

        mNotificationShadeWindowController.setForcePluginOpen(true);

    }

    }





    @Test

    public void attach_visibleWithWallpaper() {

        clearInvocations(mWindowManager);

        when(mKeyguardViewMediator.isShowingAndNotOccluded()).thenReturn(true);

        mNotificationShadeWindowController.attach();



        verify(mNotificationShadeWindowView).setVisibility(eq(View.VISIBLE));

        verify(mWindowManager).updateViewLayout(any(), mLayoutParameters.capture());

        assertThat((mLayoutParameters.getValue().flags & FLAG_SHOW_WALLPAPER) != 0).isTrue();

    }



    @Test

    @Test

    public void setBackgroundBlurRadius_expandedWithBlurs() {

    public void setBackgroundBlurRadius_expandedWithBlurs() {

        mNotificationShadeWindowController.setBackgroundBlurRadius(10);

        mNotificationShadeWindowController.setBackgroundBlurRadius(10);