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

Commit a8570405 authored by Dave Mankoff's avatar Dave Mankoff
Browse files

Move DozeServiceHost out of StatusBar. 

This is an imperfect extraction. That is to say, DozeServiceHost is
successfully moved out of StatusBar, but it is apparent, upon
inspection, that there is not good separation of concerns between
the two classes. There is some functionality that should be fully
moved from on class to to the other. I am not comfortable making that
change in this CL.

Bug: 142536902
Test: atest SystemUITests && manual
Change-Id: Ie492141005bfd2e24ce0df0665f9585e27b9e0f1
parent ff53253c

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

+10 −1
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import android.content.Context; 
import android.content.res.Configuration;

import android.graphics.Rect;

import android.graphics.drawable.Drawable;

import android.os.PowerManager;

import android.util.DisplayMetrics;

import android.util.Log;

import android.view.GestureDetector;
@@ -109,6 +110,8 @@ import com.android.systemui.statusbar.phone.AutoHideController; 
import com.android.systemui.statusbar.phone.BiometricUnlockController;

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

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

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

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

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

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

import com.android.systemui.statusbar.phone.LightBarController;
@@ -301,6 +304,9 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
            ScrimController scrimController,

            Lazy<LockscreenWallpaper> lockscreenWallpaperLazy,

            Lazy<BiometricUnlockController> biometricUnlockControllerLazy,

            DozeServiceHost dozeServiceHost,

            PowerManager powerManager,

            DozeScrimController dozeScrimController,



            /* Car Settings injected components. */

            NavigationBarViewFactory navigationBarViewFactory) {
@@ -364,7 +370,10 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
                dozeParameters,

                scrimController,

                lockscreenWallpaperLazy,

                biometricUnlockControllerLazy);

                biometricUnlockControllerLazy,

                dozeServiceHost,

                powerManager,

                dozeScrimController);

        mScrimController = scrimController;

        mNavigationBarViewFactory = navigationBarViewFactory;

    }

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

+8 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import com.android.systemui.ActivityStarterDelegate; 
import com.android.systemui.appops.AppOpsController;

import com.android.systemui.appops.AppOpsControllerImpl;

import com.android.systemui.classifier.FalsingManagerProxy;

import com.android.systemui.doze.DozeHost;

import com.android.systemui.plugins.ActivityStarter;

import com.android.systemui.plugins.DarkIconDispatcher;

import com.android.systemui.plugins.FalsingManager;
@@ -33,6 +34,7 @@ import com.android.systemui.statusbar.NotificationRemoteInputManager; 
import com.android.systemui.statusbar.StatusBarStateControllerImpl;

import com.android.systemui.statusbar.SysuiStatusBarStateController;

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

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

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

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

import com.android.systemui.statusbar.phone.StatusBarIconController;
@@ -241,5 +243,10 @@ public abstract class DependencyBinder { 
    /**

     */

    @Binds

    public abstract FalsingManager provideFalsingmanager(FalsingManagerProxy falsingManagerImpl);

    public abstract FalsingManager provideFalsingManager(FalsingManagerProxy falsingManagerImpl);



    /**

     */

    @Binds

    public abstract DozeHost provideDozeHost(DozeServiceHost dozeServiceHost);

}

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

+3 −3
Original line number Diff line number Diff line
@@ -53,10 +53,10 @@ import javax.inject.Inject; 
 */

public class BiometricUnlockController extends KeyguardUpdateMonitorCallback {



    private static final String TAG = "BiometricUnlockController";

    private static final String TAG = "BiometricUnlockCtrl";

    private static final boolean DEBUG_BIO_WAKELOCK = KeyguardConstants.DEBUG_BIOMETRIC_WAKELOCK;

    private static final long BIOMETRIC_WAKELOCK_TIMEOUT_MS = 15 * 1000;

    private static final String BIOMETRIC_WAKE_LOCK_NAME = "wake-and-unlock wakelock";

    private static final String BIOMETRIC_WAKE_LOCK_NAME = "wake-and-unlock:wakelock";



    @IntDef(prefix = { "MODE_" }, value = {

            MODE_NONE,
@@ -132,7 +132,7 @@ public class BiometricUnlockController extends KeyguardUpdateMonitorCallback { 
    private final KeyguardBypassController mKeyguardBypassController;

    private PowerManager.WakeLock mWakeLock;

    private final KeyguardUpdateMonitor mUpdateMonitor;

    private final DozeParameters mDozeParameters;

    private DozeParameters mDozeParameters;

    private final KeyguardStateController mKeyguardStateController;

    private final StatusBarWindowController mStatusBarWindowController;

    private final Context mContext;

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

+1 −7
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import android.os.UserHandle; 
import android.provider.Settings;

import android.util.MathUtils;



import com.android.internal.annotations.VisibleForTesting;

import com.android.systemui.R;

import com.android.systemui.dagger.qualifiers.MainResources;

import com.android.systemui.doze.AlwaysOnDisplayPolicy;
@@ -188,12 +187,7 @@ public class DozeParameters implements TunerService.Tunable, 
            return;

        }

        mControlScreenOffAnimation = controlScreenOffAnimation;

        getPowerManager().setDozeAfterScreenOff(!controlScreenOffAnimation);

    }



    @VisibleForTesting

    protected PowerManager getPowerManager() {

        return mPowerManager;

        mPowerManager.setDozeAfterScreenOff(!controlScreenOffAnimation);

    }



    private boolean getBoolean(String propName, int resId) {

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

+2 −0
Original line number Diff line number Diff line
@@ -29,10 +29,12 @@ import com.android.systemui.plugins.statusbar.StatusBarStateController; 
import com.android.systemui.plugins.statusbar.StatusBarStateController.StateListener;



import javax.inject.Inject;

import javax.inject.Singleton;



/**

 * Controller which handles all the doze animations of the scrims.

 */

@Singleton

public class DozeScrimController implements StateListener {

    private static final String TAG = "DozeScrimController";

    private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);