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

Commit 0875fe29 authored by Alina Zaidi's avatar Alina Zaidi Committed by Android (Google) Code Review
Browse files

Merge "Correct status bar background on connected displays" into main

parents 4e87054f d5469217
Loading
Loading
Loading
Loading
+11 −3
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import com.android.systemui.statusbar.phone.PhoneStatusBarView;
import com.android.systemui.statusbar.phone.PhoneStatusBarViewController;
import com.android.systemui.statusbar.phone.StatusBarLocation;
import com.android.systemui.statusbar.policy.Clock;
import com.android.systemui.statusbar.window.StatusBarWindowController;
import com.android.systemui.statusbar.window.StatusBarWindowControllerStore;

import dagger.Module;
@@ -128,9 +129,8 @@ public interface HomeStatusBarModule {
    @HomeStatusBarScope
    static PhoneStatusBarTransitions providePhoneStatusBarTransitions(
            @RootView PhoneStatusBarView view,
            StatusBarWindowControllerStore statusBarWindowControllerStore) {
        return new PhoneStatusBarTransitions(
                view, statusBarWindowControllerStore.getDefaultDisplay().getBackgroundView());
            StatusBarWindowController statusBarWindowController) {
        return new PhoneStatusBarTransitions(view, statusBarWindowController.getBackgroundView());
    }

    /** */
@@ -156,4 +156,12 @@ public interface HomeStatusBarModule {
        return store.forDisplay(displayId);
    }

    /** */
    @Provides
    @HomeStatusBarScope
    static StatusBarWindowController provideWindowController(
            @DisplaySpecific int displayId, StatusBarWindowControllerStore store) {
        return store.forDisplay(displayId);
    }

}