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

Commit 8f7f95a9 authored by Nicolò Mazzucato's avatar Nicolò Mazzucato Committed by Android (Google) Code Review
Browse files

Merge changes I05d567d6,I031d0a9f into main 

* changes:
  Add ShadeDisplayAware to classes left out
  Make StatusBarTouchShadeDisplayPolicy the default one
parents 4624c206 9ba13b48

packages/SystemUI/src/com/android/keyguard/ClockEventController.kt

+2 −1
Original line number Diff line number Diff line
@@ -95,9 +95,10 @@ constructor( 
    private val broadcastDispatcher: BroadcastDispatcher,

    private val batteryController: BatteryController,

    private val keyguardUpdateMonitor: KeyguardUpdateMonitor,

    // TODO b/362719719 - We should use the configuration controller associated with the display.

    private val configurationController: ConfigurationController,

    @DisplaySpecific private val resources: Resources,

    private val context: Context,

    @DisplaySpecific val context: Context,

    @Main private val mainExecutor: DelayableExecutor,

    @Background private val bgExecutor: Executor,

    private val clockBuffers: ClockMessageBuffers,

packages/SystemUI/src/com/android/keyguard/KeyguardDisplayManager.java

+5 −2
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ import com.android.systemui.dagger.qualifiers.UiBackground; 
import com.android.systemui.navigationbar.NavigationBarController;

import com.android.systemui.navigationbar.views.NavigationBarView;

import com.android.systemui.settings.DisplayTracker;

import com.android.systemui.shade.ShadeDisplayAware;

import com.android.systemui.shade.data.repository.ShadeDisplaysRepository;

import com.android.systemui.shade.shared.flag.ShadeWindowGoesAround;

import com.android.systemui.statusbar.policy.KeyguardStateController;
@@ -103,7 +104,8 @@ public class KeyguardDisplayManager { 
            };



    @Inject

    public KeyguardDisplayManager(Context context,

    public KeyguardDisplayManager(

            @ShadeDisplayAware Context context,

            Lazy<NavigationBarController> navigationBarControllerLazy,

            DisplayTracker displayTracker,

            @Main Executor mainExecutor,
@@ -331,7 +333,8 @@ public class KeyguardDisplayManager { 
        private boolean mIsInConcurrentDisplayState;



        @Inject

        DeviceStateHelper(Context context,

        DeviceStateHelper(

                @ShadeDisplayAware Context context,

                DeviceStateManager deviceStateManager,

                @Main Executor mainExecutor) {

packages/SystemUI/src/com/android/keyguard/KeyguardUnfoldTransition.kt

+2 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import com.android.systemui.plugins.statusbar.StatusBarStateController 
import com.android.systemui.res.R

import com.android.systemui.shared.R as sharedR

import com.android.systemui.shade.NotificationShadeWindowView

import com.android.systemui.shade.ShadeDisplayAware

import com.android.systemui.shared.animation.UnfoldConstantTranslateAnimator

import com.android.systemui.shared.animation.UnfoldConstantTranslateAnimator.Direction.END

import com.android.systemui.shared.animation.UnfoldConstantTranslateAnimator.Direction.START
@@ -43,7 +44,7 @@ import javax.inject.Inject 
class KeyguardUnfoldTransition

@Inject

constructor(

    private val context: Context,

    @ShadeDisplayAware private val context: Context,

    private val keyguardRootView: KeyguardRootView,

    private val shadeWindowView: NotificationShadeWindowView,

    statusBarStateController: StatusBarStateController,

packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java

+2 −1
Original line number Diff line number Diff line
@@ -152,6 +152,7 @@ import com.android.systemui.scene.domain.interactor.SceneInteractor; 
import com.android.systemui.scene.shared.flag.SceneContainerFlag;

import com.android.systemui.scene.shared.model.Scenes;

import com.android.systemui.settings.UserTracker;

import com.android.systemui.shade.ShadeDisplayAware;

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

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

import com.android.systemui.statusbar.StatusBarState;
@@ -2163,7 +2164,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
    @VisibleForTesting

    @Inject

    protected KeyguardUpdateMonitor(

            Context context,

            @ShadeDisplayAware Context context,

            UserTracker userTracker,

            @Main Looper mainLooper,

            BroadcastDispatcher broadcastDispatcher,

packages/SystemUI/src/com/android/keyguard/dagger/ClockRegistryModule.java

+2 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import com.android.systemui.keyguard.MigrateClocksToBlueprint; 
import com.android.systemui.plugins.PluginManager;

import com.android.systemui.plugins.clocks.ClockMessageBuffers;

import com.android.systemui.res.R;

import com.android.systemui.shade.ShadeDisplayAware;

import com.android.systemui.shared.clocks.ClockRegistry;

import com.android.systemui.shared.clocks.DefaultClockProvider;

import com.android.systemui.util.ThreadAssert;
@@ -47,7 +48,7 @@ public abstract class ClockRegistryModule { 
    @Provides

    @SysUISingleton

    public static ClockRegistry getClockRegistry(

            @Application Context context,

            @ShadeDisplayAware Context context,

            PluginManager pluginManager,

            @Application CoroutineScope scope,

            @Main CoroutineDispatcher mainDispatcher,