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

Commit 22b934f1 authored by Lucas Dupin's avatar Lucas Dupin
Browse files

Revert "Move DozeServiceHost out of StatusBar." 

Fixes: 143334366
Test: manual
This reverts commit a8570405.

Change-Id: Ia5b5302a659f073cff6ab557bd70bfdbb070d86d
parent 88c53fce

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

+1 −10
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 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;
@@ -108,8 +107,6 @@ 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;
@@ -298,9 +295,6 @@ 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. */

            CarNavigationBarController carNavigationBarController) {
@@ -364,10 +358,7 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
                dozeParameters,

                scrimController,

                lockscreenWallpaperLazy,

                biometricUnlockControllerLazy,

                dozeServiceHost,

                powerManager,

                dozeScrimController);

                biometricUnlockControllerLazy);

        mScrimController = scrimController;

        mCarNavigationBarController = carNavigationBarController;

    }

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

+1 −8
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 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;
@@ -34,7 +33,6 @@ 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;
@@ -243,10 +241,5 @@ public abstract class DependencyBinder { 
    /**

     */

    @Binds

    public abstract FalsingManager provideFalsingManager(FalsingManagerProxy falsingManagerImpl);



    /**

     */

    @Binds

    public abstract DozeHost provideDozeHost(DozeServiceHost dozeServiceHost);

    public abstract FalsingManager provideFalsingmanager(FalsingManagerProxy falsingManagerImpl);

}

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

+3 −3
Original line number Diff line number Diff line
@@ -55,10 +55,10 @@ import javax.inject.Singleton; 
@Singleton

public class BiometricUnlockController extends KeyguardUpdateMonitorCallback {



    private static final String TAG = "BiometricUnlockCtrl";

    private static final String TAG = "BiometricUnlockController";

    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,
@@ -134,7 +134,7 @@ public class BiometricUnlockController extends KeyguardUpdateMonitorCallback { 
    private final KeyguardBypassController mKeyguardBypassController;

    private PowerManager.WakeLock mWakeLock;

    private final KeyguardUpdateMonitor mUpdateMonitor;

    private DozeParameters mDozeParameters;

    private final DozeParameters mDozeParameters;

    private final KeyguardStateController mKeyguardStateController;

    private final StatusBarWindowController mStatusBarWindowController;

    private final Context mContext;

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

+7 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 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;
@@ -187,7 +188,12 @@ public class DozeParameters implements TunerService.Tunable, 
            return;

        }

        mControlScreenOffAnimation = controlScreenOffAnimation;

        mPowerManager.setDozeAfterScreenOff(!controlScreenOffAnimation);

        getPowerManager().setDozeAfterScreenOff(!controlScreenOffAnimation);

    }



    @VisibleForTesting

    protected PowerManager getPowerManager() {

        return mPowerManager;

    }



    private boolean getBoolean(String propName, int resId) {

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

+0 −2
Original line number Diff line number Diff line
@@ -29,12 +29,10 @@ 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);