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

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

Merge "[Status Bar Refactor] Define a new dagger component that gets... 

Merge "[Status Bar Refactor] Define a new dagger component that gets re-created each time CollapsedStatusBarFragment is re-created." into sc-v2-dev am: fe4103f5

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

Change-Id: I244ab9130fda27bbdd91bd0b6dcd8aa4df0915dc
parents 6cc3a298 fe4103f5

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

+2 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ import com.android.systemui.statusbar.notification.row.dagger.NotificationShelfC 
import com.android.systemui.statusbar.phone.ShadeController;

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

import com.android.systemui.statusbar.phone.dagger.StatusBarComponent;

import com.android.systemui.statusbar.phone.fragment.dagger.StatusBarFragmentComponent;

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

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

import com.android.systemui.statusbar.policy.ZenModeController;
@@ -124,6 +125,7 @@ import dagger.Provides; 
        },

        subcomponents = {

            StatusBarComponent.class,

            StatusBarFragmentComponent.class,

            NotificationRowComponent.class,

            DozeComponent.class,

            ExpandableNotificationRowComponent.class,

packages/SystemUI/src/com/android/systemui/fragments/FragmentService.java

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ import com.android.systemui.Dumpable; 
import com.android.systemui.dagger.SysUISingleton;

import com.android.systemui.dump.DumpManager;

import com.android.systemui.qs.QSFragment;

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

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

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



import java.io.FileDescriptor;

packages/SystemUI/src/com/android/systemui/log/dagger/CollapsedSbFragmentLog.java

+2 −2
Original line number Diff line number Diff line
@@ -26,8 +26,8 @@ import java.lang.annotation.Retention; 
import javax.inject.Qualifier;



/**

 * A {@link LogBuffer} for

 * {@link com.android.systemui.statusbar.phone.CollapsedStatusBarFragment}-related messages.

 * A {@link LogBuffer} for {@link

 * com.android.systemui.statusbar.phone.fragment.CollapsedStatusBarFragment}-related messages.

 */

@Qualifier

@Documented

packages/SystemUI/src/com/android/systemui/log/dagger/LogModule.java

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ public class LogModule { 


    /**

     * Provides a logging buffer for

     * {@link com.android.systemui.statusbar.phone.CollapsedStatusBarFragment}.

     * {@link com.android.systemui.statusbar.phone.fragment.CollapsedStatusBarFragment}.

     */

    @Provides

    @SysUISingleton

packages/SystemUI/src/com/android/systemui/qs/QSFragmentDisableFlagsLogger.kt

+0 −1
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ import com.android.systemui.log.LogBuffer 
import com.android.systemui.log.LogLevel

import com.android.systemui.log.dagger.QSFragmentDisableLog

import com.android.systemui.statusbar.DisableFlagsLogger

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

import javax.inject.Inject



/** A helper class for logging disable flag changes made in [QSFragment]. */