[automerger skipped] Merge 10952656 am: ba53c7d7ea -s ours am: f139fedd1f -s ours
am skip reason: Merged-In I19919ca8074ab200d31debc091a8f196e8018e6e with SHA-1 45f8de0fdb is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/SystemUIGo/+/25092613
Change-Id: I42d2bced6009af607cb1d8336cd5241bea068d11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/src/com/android/systemui/go/SystemUIGoComponent.java b/src/com/android/systemui/go/SystemUIGoComponent.java
index 78b25f7..1b67cd6 100644
--- a/src/com/android/systemui/go/SystemUIGoComponent.java
+++ b/src/com/android/systemui/go/SystemUIGoComponent.java
@@ -26,6 +26,7 @@
import com.android.systemui.keyguard.dagger.KeyguardModule;
import com.android.systemui.keyguard.CustomizationProvider;
import com.android.systemui.recents.RecentsModule;
+import com.android.systemui.scene.SceneContainerFrameworkModule;
import com.android.systemui.statusbar.dagger.CentralSurfacesModule;
import com.android.systemui.statusbar.NotificationInsetsModule;
import com.android.systemui.statusbar.QsFrameTranslateModule;
@@ -45,6 +46,7 @@
SystemUIGoCoreStartableModule.class,
KeyguardModule.class,
RecentsModule.class,
+ SceneContainerFrameworkModule.class,
CentralSurfacesModule.class,
NotificationInsetsModule.class,
QsFrameTranslateModule.class,
diff --git a/src/com/android/systemui/go/SystemUIGoCoreStartableModule.java b/src/com/android/systemui/go/SystemUIGoCoreStartableModule.java
index 6b6c948..c5b250b 100644
--- a/src/com/android/systemui/go/SystemUIGoCoreStartableModule.java
+++ b/src/com/android/systemui/go/SystemUIGoCoreStartableModule.java
@@ -23,6 +23,7 @@
import com.android.systemui.SliceBroadcastRelayHandler;
import com.android.systemui.accessibility.SystemActions;
import com.android.systemui.accessibility.WindowMagnification;
+import com.android.systemui.back.domain.interactor.BackActionInteractor;
import com.android.systemui.biometrics.AuthController;
import com.android.systemui.clipboardoverlay.ClipboardListener;
import com.android.systemui.dagger.qualifiers.PerUser;
@@ -215,4 +216,10 @@
@IntoMap
@ClassKey(StatusBarHeadsUpChangeListener.class)
abstract CoreStartable bindStatusBarHeadsUpChangeListener(StatusBarHeadsUpChangeListener impl);
+
+ /** Inject into BackActionInteractor. */
+ @Binds
+ @IntoMap
+ @ClassKey(BackActionInteractor.class)
+ abstract CoreStartable bindBackActionInteractor(BackActionInteractor backActionInteractor);
}
diff --git a/src/com/android/systemui/go/SystemUIGoModule.java b/src/com/android/systemui/go/SystemUIGoModule.java
index 0843d3a..e73993f 100644
--- a/src/com/android/systemui/go/SystemUIGoModule.java
+++ b/src/com/android/systemui/go/SystemUIGoModule.java
@@ -25,6 +25,7 @@
import com.android.internal.logging.UiEventLogger;
import com.android.keyguard.KeyguardViewController;
+import com.android.systemui.battery.BatterySaverModule;
import com.android.systemui.dagger.GlobalRootComponent;
import com.android.systemui.dagger.ReferenceSystemUIModule;
import com.android.systemui.dagger.SysUISingleton;
@@ -34,6 +35,7 @@
import com.android.systemui.doze.DozeHost;
import com.android.systemui.globalactions.ShutdownUiModule;
import com.android.systemui.media.dagger.MediaModule;
+import com.android.systemui.navigationbar.NavigationBarControllerModule;
import com.android.systemui.navigationbar.gestural.GestureModule;
import com.android.systemui.plugins.qs.QSFactory;
import com.android.systemui.plugins.statusbar.StatusBarStateController;
@@ -42,6 +44,7 @@
import com.android.systemui.qs.tileimpl.QSFactoryImpl;
import com.android.systemui.recents.Recents;
import com.android.systemui.recents.RecentsImplementation;
+import com.android.systemui.rotationlock.RotationLockModule;
import com.android.systemui.screenshot.ReferenceScreenshotModule;
import com.android.systemui.settings.dagger.MultiUserUtilsModule;
import com.android.systemui.shade.NotificationShadeWindowControllerImpl;
@@ -56,16 +59,15 @@
import com.android.systemui.statusbar.notification.collection.provider.VisualStabilityProvider;
import com.android.systemui.statusbar.notification.collection.render.GroupMembershipManager;
import com.android.systemui.statusbar.phone.DozeServiceHost;
-import com.android.systemui.statusbar.phone.HeadsUpManagerPhone;
+import com.android.systemui.statusbar.phone.HeadsUpModule;
import com.android.systemui.statusbar.phone.KeyguardBypassController;
import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;
+import com.android.systemui.statusbar.phone.fragment.CollapsedStatusBarFragmentStartableModule;
import com.android.systemui.statusbar.policy.AccessibilityManagerWrapper;
import com.android.systemui.statusbar.policy.AospPolicyModule;
import com.android.systemui.statusbar.policy.ConfigurationController;
import com.android.systemui.statusbar.policy.DeviceProvisionedController;
import com.android.systemui.statusbar.policy.DeviceProvisionedControllerImpl;
-import com.android.systemui.statusbar.policy.HeadsUpManager;
-import com.android.systemui.statusbar.policy.HeadsUpManagerLogger;
import com.android.systemui.statusbar.policy.IndividualSensorPrivacyController;
import com.android.systemui.statusbar.policy.IndividualSensorPrivacyControllerImpl;
import com.android.systemui.statusbar.policy.SensorPrivacyController;
@@ -85,12 +87,17 @@
*/
@Module(includes = {
AospPolicyModule.class,
+ BatterySaverModule.class,
+ CollapsedStatusBarFragmentStartableModule.class,
GestureModule.class,
+ HeadsUpModule.class,
MediaModule.class,
MultiUserUtilsModule.class,
+ NavigationBarControllerModule.class,
PowerModule.class,
QSModule.class,
ReferenceScreenshotModule.class,
+ RotationLockModule.class,
ShadeModule.class,
ShutdownUiModule.class,
StartCentralSurfacesModule.class,
@@ -148,38 +155,6 @@
return true;
}
- @SysUISingleton
- @Provides
- static HeadsUpManagerPhone provideHeadsUpManagerPhone(
- Context context,
- HeadsUpManagerLogger headsUpManagerLogger,
- StatusBarStateController statusBarStateController,
- KeyguardBypassController bypassController,
- GroupMembershipManager groupManager,
- VisualStabilityProvider visualStabilityProvider,
- ConfigurationController configurationController,
- @Main Handler handler,
- AccessibilityManagerWrapper accessibilityManagerWrapper,
- UiEventLogger uiEventLogger,
- ShadeExpansionStateManager shadeExpansionStateManager) {
- return new HeadsUpManagerPhone(
- context,
- headsUpManagerLogger,
- statusBarStateController,
- bypassController,
- groupManager,
- visualStabilityProvider,
- configurationController,
- handler,
- accessibilityManagerWrapper,
- uiEventLogger,
- shadeExpansionStateManager
- );
- }
-
- @Binds
- abstract HeadsUpManager bindHeadsUpManagerPhone(HeadsUpManagerPhone headsUpManagerPhone);
-
@Provides
@SysUISingleton
static Recents provideRecents(Context context, RecentsImplementation recentsImplementation,
