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

Commit ad1ad0d5 authored by Caitlin Cassidy's avatar Caitlin Cassidy Committed by Automerger Merge Worker
Browse files

Merge "[Status Bar Refactor] 3/3: Inject StatusBarWindowView instead of having... 

Merge "[Status Bar Refactor] 3/3: Inject StatusBarWindowView instead of having the controller construct it." into sc-v2-dev am: b05878a1

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

Change-Id: Id354292f5e094cc4d6710417001acacc2512bd03
parents 32fb93ea b05878a1

packages/SystemUI/res/layout/super_status_bar.xml

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
-->



<!-- This is the status bar window. -->

<com.android.systemui.statusbar.phone.StatusBarWindowView

<com.android.systemui.statusbar.window.StatusBarWindowView

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:sysui="http://schemas.android.com/apk/res-auto"

    android:layout_width="match_parent"
@@ -35,4 +35,4 @@ 
        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:background="@drawable/system_bar_background" />

</com.android.systemui.statusbar.phone.StatusBarWindowView>
 
</com.android.systemui.statusbar.window.StatusBarWindowView>

packages/SystemUI/src/com/android/systemui/Dependency.java

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,6 @@ import com.android.systemui.statusbar.phone.NotificationGroupAlertTransferHelper 
import com.android.systemui.statusbar.phone.ShadeController;

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

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

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

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

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

import com.android.systemui.statusbar.policy.AccessibilityManagerWrapper;
@@ -129,6 +128,7 @@ import com.android.systemui.statusbar.policy.SmartReplyConstants; 
import com.android.systemui.statusbar.policy.UserInfoController;

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

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

import com.android.systemui.statusbar.window.StatusBarWindowController;

import com.android.systemui.telephony.TelephonyListenerManager;

import com.android.systemui.tracing.ProtoTracer;

import com.android.systemui.tuner.TunablePadding.TunablePaddingService;

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

+2 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ import com.android.systemui.statusbar.policy.HeadsUpManager; 
import com.android.systemui.statusbar.policy.ZenModeController;

import com.android.systemui.statusbar.policy.dagger.SmartRepliesInflationModule;

import com.android.systemui.statusbar.policy.dagger.StatusBarPolicyModule;

import com.android.systemui.statusbar.window.StatusBarWindowModule;

import com.android.systemui.tuner.dagger.TunerModule;

import com.android.systemui.user.UserModule;

import com.android.systemui.util.concurrency.SysUIConcurrencyModule;
@@ -112,6 +113,7 @@ import dagger.Provides; 
            SettingsUtilModule.class,

            SmartRepliesInflationModule.class,

            StatusBarPolicyModule.class,

            StatusBarWindowModule.class,

            SysUIConcurrencyModule.class,

            TunerModule.class,

            UserModule.class,

packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java

+1 −1
Original line number Diff line number Diff line
@@ -40,10 +40,10 @@ import com.android.systemui.R; 
import com.android.systemui.battery.BatteryMeterView;

import com.android.systemui.qs.QSDetail.Callback;

import com.android.systemui.statusbar.phone.StatusBarIconController.TintedIconManager;

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

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

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

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

import com.android.systemui.statusbar.window.StatusBarWindowView;



import java.util.List;

packages/SystemUI/src/com/android/systemui/statusbar/dagger/StatusBarDependenciesModule.java

+3 −1
Original line number Diff line number Diff line
@@ -67,11 +67,13 @@ import com.android.systemui.statusbar.phone.StatusBar; 
import com.android.systemui.statusbar.phone.StatusBarIconController;

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

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

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

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

import com.android.systemui.statusbar.phone.ongoingcall.OngoingCallController;

import com.android.systemui.statusbar.phone.ongoingcall.OngoingCallLogger;

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

import com.android.systemui.statusbar.window.StatusBarWindowController;

import com.android.systemui.statusbar.window.StatusBarWindowModule;

import com.android.systemui.statusbar.window.StatusBarWindowView;

import com.android.systemui.tracing.ProtoTracer;

import com.android.systemui.util.concurrency.DelayableExecutor;

import com.android.systemui.util.time.SystemClock;