From 643efcb11fd736a263a7956dd7a9cd4c6524b3a0 Mon Sep 17 00:00:00 2001 From: Dave Mankoff Date: Fri, 11 Nov 2022 14:48:10 +0000 Subject: Clean up proguard.flags. We don't use reflection anymore. Let proguard figure out these details. Use proguard_common.flags from AOSP. Bug: 257631899 Test: presubmits Change-Id: I10b54e06f42ed84fdc5a9343c01d0b45364ae21c --- proguard.flags | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/proguard.flags b/proguard.flags index 1f701aa..8cb818b 100644 --- a/proguard.flags +++ b/proguard.flags @@ -1,4 +1 @@ --keep class com.android.systemui.go.SystemUIGoInitializer --keep,allowoptimization,allowaccessmodification class com.android.systemui.go.DaggerSystemUIGoGlobalRootComponent$SystemUIGoComponentImpl { !synthetic *; } - --include ../../../frameworks/base/packages/SystemUI/proguard.flags \ No newline at end of file +-include ../../../frameworks/base/packages/SystemUI/proguard_common.flags \ No newline at end of file -- cgit v1.2.3 From 6b2df636167be08b15fb34ed7056434e33bbe7ca Mon Sep 17 00:00:00 2001 From: Alison Cichowlas Date: Wed, 10 May 2023 11:23:03 -0400 Subject: Add ShutdownUiModule to SystemUIGo. Test: builds in presubmit Bug: 267722480 Change-Id: I0e5351f714bf710056d432fd3b1adb2d4add0cf9 --- src/com/android/systemui/go/SystemUIGoModule.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/com/android/systemui/go/SystemUIGoModule.java b/src/com/android/systemui/go/SystemUIGoModule.java index 5ca4db2..9ca04c6 100644 --- a/src/com/android/systemui/go/SystemUIGoModule.java +++ b/src/com/android/systemui/go/SystemUIGoModule.java @@ -32,6 +32,7 @@ import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.dock.DockManager; import com.android.systemui.dock.DockManagerImpl; import com.android.systemui.doze.DozeHost; +import com.android.systemui.globalactions.ShutdownUiModule; import com.android.systemui.media.dagger.MediaModule; import com.android.systemui.navigationbar.gestural.GestureModule; import com.android.systemui.plugins.qs.QSFactory; @@ -90,6 +91,7 @@ import dagger.Provides; PowerModule.class, QSModule.class, ReferenceScreenshotModule.class, + ShutdownUiModule.class, StartCentralSurfacesModule.class, StatusBarEventsModule.class, VolumeModule.class -- cgit v1.2.3 From b517d35ff5189c6164887d3542600fb2f41a8139 Mon Sep 17 00:00:00 2001 From: Justin Weir Date: Wed, 5 Jul 2023 13:53:52 -0400 Subject: Include ShadeModule ShadeModule will no longer be included by default, because variants like TV do not have a shade, so it must be included here. Bug: 288867586 Test: presubmits are sufficient Change-Id: Ie0d571971ef4178f9c4b093c0089220ae64cded4 --- src/com/android/systemui/go/SystemUIGoModule.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/com/android/systemui/go/SystemUIGoModule.java b/src/com/android/systemui/go/SystemUIGoModule.java index 9ca04c6..efd27b9 100644 --- a/src/com/android/systemui/go/SystemUIGoModule.java +++ b/src/com/android/systemui/go/SystemUIGoModule.java @@ -48,6 +48,7 @@ import com.android.systemui.shade.NotificationShadeWindowControllerImpl; import com.android.systemui.shade.ShadeController; import com.android.systemui.shade.ShadeControllerImpl; import com.android.systemui.shade.ShadeExpansionStateManager; +import com.android.systemui.shade.ShadeModule; import com.android.systemui.statusbar.CommandQueue; import com.android.systemui.statusbar.NotificationLockscreenUserManager; import com.android.systemui.statusbar.NotificationLockscreenUserManagerImpl; @@ -91,6 +92,7 @@ import dagger.Provides; PowerModule.class, QSModule.class, ReferenceScreenshotModule.class, + ShadeModule.class, ShutdownUiModule.class, StartCentralSurfacesModule.class, StatusBarEventsModule.class, -- cgit v1.2.3 From 1149a16f7b43026bd97e31d075cd917e9d01432c Mon Sep 17 00:00:00 2001 From: Caitlin Shkuratov Date: Fri, 30 Jun 2023 17:37:21 +0000 Subject: [CS] Add ScrimController and WallpaperRepo to SystemUIGo. The partner CL in the frameworks/base repo moves some code out of CentralSurfacesImpl and into WallpaperRepository & ScrimController. My understanding is that SysUIGo uses CentralSurfacesImpl, so SysUIGo now needs to explicitly include these. Bug: 277764509 Test: m SystemUIGo Change-Id: If29028da22281a3a518b5c5bfd08028c1f857471 --- src/com/android/systemui/go/SystemUIGoCoreStartableModule.java | 7 +++++++ src/com/android/systemui/go/SystemUIGoModule.java | 2 ++ 2 files changed, 9 insertions(+) diff --git a/src/com/android/systemui/go/SystemUIGoCoreStartableModule.java b/src/com/android/systemui/go/SystemUIGoCoreStartableModule.java index d8bfe7e..e64b49d 100644 --- a/src/com/android/systemui/go/SystemUIGoCoreStartableModule.java +++ b/src/com/android/systemui/go/SystemUIGoCoreStartableModule.java @@ -36,6 +36,7 @@ import com.android.systemui.recents.Recents; import com.android.systemui.shortcut.ShortcutKeyDispatcher; import com.android.systemui.statusbar.notification.InstantAppNotifier; import com.android.systemui.statusbar.phone.LockscreenWallpaper; +import com.android.systemui.statusbar.phone.ScrimController; import com.android.systemui.theme.ThemeOverlayController; import com.android.systemui.toast.ToastUI; import com.android.systemui.usb.StorageNotification; @@ -202,4 +203,10 @@ abstract class SystemUIGoCoreStartableModule { @IntoMap @ClassKey(LockscreenWallpaper.class) abstract CoreStartable bindLockscreenWallpaper(LockscreenWallpaper lockscreenWallpaper); + + /** Inject into ScrimController. */ + @Binds + @IntoMap + @ClassKey(ScrimController.class) + abstract CoreStartable bindScrimController(ScrimController scrimController); } diff --git a/src/com/android/systemui/go/SystemUIGoModule.java b/src/com/android/systemui/go/SystemUIGoModule.java index efd27b9..deb6efe 100644 --- a/src/com/android/systemui/go/SystemUIGoModule.java +++ b/src/com/android/systemui/go/SystemUIGoModule.java @@ -73,6 +73,7 @@ import com.android.systemui.statusbar.policy.IndividualSensorPrivacyControllerIm import com.android.systemui.statusbar.policy.SensorPrivacyController; import com.android.systemui.statusbar.policy.SensorPrivacyControllerImpl; import com.android.systemui.volume.dagger.VolumeModule; +import com.android.systemui.wallpapers.dagger.WallpaperModule; import javax.inject.Named; @@ -96,6 +97,7 @@ import dagger.Provides; ShutdownUiModule.class, StartCentralSurfacesModule.class, StatusBarEventsModule.class, + WallpaperModule.class, VolumeModule.class }) public abstract class SystemUIGoModule { -- cgit v1.2.3 From c6e3f84d83eaa193137196fe300acc4b46de42c0 Mon Sep 17 00:00:00 2001 From: Justin Weir Date: Mon, 17 Jul 2023 15:53:42 -0400 Subject: Move ShadeController binding to ShadeModule Bug: 288868098 Bug: 291620003 Test: presubmits are sufficient Change-Id: Ic01debcab18f1c777f838e3240e7041cb6c41253 --- src/com/android/systemui/go/SystemUIGoModule.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/com/android/systemui/go/SystemUIGoModule.java b/src/com/android/systemui/go/SystemUIGoModule.java index deb6efe..0843d3a 100644 --- a/src/com/android/systemui/go/SystemUIGoModule.java +++ b/src/com/android/systemui/go/SystemUIGoModule.java @@ -45,8 +45,6 @@ import com.android.systemui.recents.RecentsImplementation; import com.android.systemui.screenshot.ReferenceScreenshotModule; import com.android.systemui.settings.dagger.MultiUserUtilsModule; import com.android.systemui.shade.NotificationShadeWindowControllerImpl; -import com.android.systemui.shade.ShadeController; -import com.android.systemui.shade.ShadeControllerImpl; import com.android.systemui.shade.ShadeExpansionStateManager; import com.android.systemui.shade.ShadeModule; import com.android.systemui.statusbar.CommandQueue; @@ -143,9 +141,6 @@ public abstract class SystemUIGoModule { @Binds abstract DockManager bindDockManager(DockManagerImpl dockManager); - @Binds - abstract ShadeController provideShadeController(ShadeControllerImpl shadeController); - @SysUISingleton @Provides @Named(ALLOW_NOTIFICATION_LONG_PRESS_NAME) -- cgit v1.2.3 From c872c0a53be8eeeeabed05e4a938f8849df97a6d Mon Sep 17 00:00:00 2001 From: Caitlin Shkuratov Date: Wed, 16 Aug 2023 19:21:18 +0000 Subject: [CS] Add BackActionInteractor to SysUIGo. The partner CL in the frameworks/base repo moves some code out of CentralSurfacesImpl and into BackActionInteractor. My understanding is that SysUIGo uses CentralSurfacesImpl, so SysUIGo now also needs to explicitly include BackActionInteractor since the code is moved. Bug: 296050180 Test: m SystemUIGo Change-Id: I4cc5f65144d0ee96c56fa52821717a53974b93f2 --- src/com/android/systemui/go/SystemUIGoCoreStartableModule.java | 7 +++++++ 1 file changed, 7 insertions(+) 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.ScreenDecorations; 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 @@ abstract class SystemUIGoCoreStartableModule { @IntoMap @ClassKey(StatusBarHeadsUpChangeListener.class) abstract CoreStartable bindStatusBarHeadsUpChangeListener(StatusBarHeadsUpChangeListener impl); + + /** Inject into BackActionInteractor. */ + @Binds + @IntoMap + @ClassKey(BackActionInteractor.class) + abstract CoreStartable bindBackActionInteractor(BackActionInteractor backActionInteractor); } -- cgit v1.2.3 From 725f8cdefa0087762997a7ced663ff348f4c2065 Mon Sep 17 00:00:00 2001 From: Caitlin Shkuratov Date: Wed, 30 Aug 2023 16:47:43 +0000 Subject: [CS] Add the status bar fragment module to SysUIGo. Bug: 277762009 Test: compiles Change-Id: I80aa20efc4677c06cfe69b113d0f1673addfd574 --- src/com/android/systemui/go/SystemUIGoModule.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/com/android/systemui/go/SystemUIGoModule.java b/src/com/android/systemui/go/SystemUIGoModule.java index 0843d3a..e26ecf4 100644 --- a/src/com/android/systemui/go/SystemUIGoModule.java +++ b/src/com/android/systemui/go/SystemUIGoModule.java @@ -59,6 +59,7 @@ import com.android.systemui.statusbar.phone.DozeServiceHost; import com.android.systemui.statusbar.phone.HeadsUpManagerPhone; 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; @@ -85,6 +86,7 @@ import dagger.Provides; */ @Module(includes = { AospPolicyModule.class, + CollapsedStatusBarFragmentStartableModule.class, GestureModule.class, MediaModule.class, MultiUserUtilsModule.class, -- cgit v1.2.3 From ae718c5f94a7be830962946c12484871a7627b06 Mon Sep 17 00:00:00 2001 From: Alejandro Nijamkin Date: Wed, 30 Aug 2023 12:16:26 -0700 Subject: [flexiglass] Breaks up dagger modules. To enable variants of System UI to build without certain scenes, the CLs in this topic: 1. Break up SceneModule to individual scene modules for each scene 2. Create Compose-enabled and -disabled versions for each one so the build works with or without the Compose build-time flag being on 3. Move the top-level SceneContainerFrameworkModule to ReferenceSystemUIModule (for AOSP) and to SystemUIGoogleModule (for sysuig) so handheld builds can use all scenes. 4. Create a keyguard-less top-level module for ARC. 5. Create a shade-less top-level for TV and Car. Bug: 298225167 Test: builds with and without the Compose flag being on, does not crash on sysuig. Change-Id: Ic2b5ed510ebffe8fa449cbbda56680186abacfb8 --- src/com/android/systemui/go/SystemUIGoComponent.java | 2 ++ 1 file changed, 2 insertions(+) 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.dagger.SystemUIModule; 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 @@ import dagger.Subcomponent; SystemUIGoCoreStartableModule.class, KeyguardModule.class, RecentsModule.class, + SceneContainerFrameworkModule.class, CentralSurfacesModule.class, NotificationInsetsModule.class, QsFrameTranslateModule.class, -- cgit v1.2.3 From 783fd27c196ed257c529591574f12569ab430e34 Mon Sep 17 00:00:00 2001 From: Caitlin Shkuratov Date: Tue, 19 Sep 2023 16:44:37 +0000 Subject: [CS] Add NavBarControllerModule to SystemUIGo. Bug: 277764509 Test: m SystemUIGo Change-Id: I1cadbc9ace9d96847dc63e2f6f3b28148b6e3c8e --- src/com/android/systemui/go/SystemUIGoModule.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/com/android/systemui/go/SystemUIGoModule.java b/src/com/android/systemui/go/SystemUIGoModule.java index e26ecf4..e4880f7 100644 --- a/src/com/android/systemui/go/SystemUIGoModule.java +++ b/src/com/android/systemui/go/SystemUIGoModule.java @@ -34,6 +34,7 @@ import com.android.systemui.dock.DockManagerImpl; 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; @@ -90,6 +91,7 @@ import dagger.Provides; GestureModule.class, MediaModule.class, MultiUserUtilsModule.class, + NavigationBarControllerModule.class, PowerModule.class, QSModule.class, ReferenceScreenshotModule.class, -- cgit v1.2.3 From 73cf6135f5b232961dbaa6d4905b115e86a83c12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Kozynski?= Date: Wed, 27 Sep 2023 10:38:23 -0400 Subject: Add missing QS tiles modules The modules were missing, making QSFactoryImpl not able to create those tiles. Fixes: 301374053 Test: build mokey_go32 and add tiles Change-Id: I84ea4e1783055ecd81bb0db3936bf4829581ab0c --- src/com/android/systemui/go/SystemUIGoModule.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/com/android/systemui/go/SystemUIGoModule.java b/src/com/android/systemui/go/SystemUIGoModule.java index e4880f7..677832b 100644 --- a/src/com/android/systemui/go/SystemUIGoModule.java +++ b/src/com/android/systemui/go/SystemUIGoModule.java @@ -25,6 +25,7 @@ import android.os.Handler; 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; @@ -43,6 +44,7 @@ import com.android.systemui.qs.dagger.QSModule; 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; @@ -87,6 +89,7 @@ import dagger.Provides; */ @Module(includes = { AospPolicyModule.class, + BatterySaverModule.class, CollapsedStatusBarFragmentStartableModule.class, GestureModule.class, MediaModule.class, @@ -95,6 +98,7 @@ import dagger.Provides; PowerModule.class, QSModule.class, ReferenceScreenshotModule.class, + RotationLockModule.class, ShadeModule.class, ShutdownUiModule.class, StartCentralSurfacesModule.class, -- cgit v1.2.3 From 416c01cc3d8dfc82fa8841cddaeea807e9c36431 Mon Sep 17 00:00:00 2001 From: Justin Weir Date: Wed, 4 Oct 2023 09:36:29 -0400 Subject: Remove HeadsUpManagerPhone from some variants HeadsUpMangerPhone is only needed in phones and car, but it is included in all variants. This currently blocks development of the new shade domain layer, because we'd need to spend time updating the variants to include it when we integrate with HeadsUpManagerPhone. I tried cleaning up some dependencies in order to prevent variants from wanting it in the first place, but that change wasn't viable. This change extracts an interface and binds a no op impl in the variants that don't need it and HeadsUpMangerPhone in those that do. It also changes the class to a singleton and makes the constructor injectable to simplify its binding. Bug: 302508896 Test: build and presubmits are sufficient Change-Id: I7a69228b35e3030732a25c9cb008143b86406a45 --- src/com/android/systemui/go/SystemUIGoModule.java | 37 ++--------------------- 1 file changed, 2 insertions(+), 35 deletions(-) diff --git a/src/com/android/systemui/go/SystemUIGoModule.java b/src/com/android/systemui/go/SystemUIGoModule.java index 677832b..e73993f 100644 --- a/src/com/android/systemui/go/SystemUIGoModule.java +++ b/src/com/android/systemui/go/SystemUIGoModule.java @@ -59,7 +59,7 @@ import com.android.systemui.statusbar.events.StatusBarEventsModule; 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; @@ -68,8 +68,6 @@ 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; @@ -92,6 +90,7 @@ import dagger.Provides; BatterySaverModule.class, CollapsedStatusBarFragmentStartableModule.class, GestureModule.class, + HeadsUpModule.class, MediaModule.class, MultiUserUtilsModule.class, NavigationBarControllerModule.class, @@ -156,38 +155,6 @@ public abstract class SystemUIGoModule { 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, -- cgit v1.2.3 From e3ea49f7a7dac0547059657f8789e3a522c65c98 Mon Sep 17 00:00:00 2001 From: Brad Hinegardner Date: Wed, 11 Oct 2023 13:43:46 +0000 Subject: Add KeyguardViewConfigurator to SystemUi Go Bug: 290652751 Change-Id: Iee053b09d5a342f947b104ee32d7a06a0271e40f --- src/com/android/systemui/go/SystemUIGoCoreStartableModule.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/com/android/systemui/go/SystemUIGoCoreStartableModule.java b/src/com/android/systemui/go/SystemUIGoCoreStartableModule.java index c5b250b..1c0308f 100644 --- a/src/com/android/systemui/go/SystemUIGoCoreStartableModule.java +++ b/src/com/android/systemui/go/SystemUIGoCoreStartableModule.java @@ -29,6 +29,7 @@ import com.android.systemui.clipboardoverlay.ClipboardListener; import com.android.systemui.dagger.qualifiers.PerUser; import com.android.systemui.globalactions.GlobalActionsComponent; import com.android.systemui.keyboard.KeyboardUI; +import com.android.systemui.keyguard.KeyguardViewConfigurator; import com.android.systemui.keyguard.KeyguardViewMediator; import com.android.systemui.log.SessionTracker; import com.android.systemui.media.RingtonePlayer; @@ -200,6 +201,11 @@ abstract class SystemUIGoCoreStartableModule { @ClassKey(WMShell.class) abstract CoreStartable bindWMShell(WMShell wmShell); + @Binds + @IntoMap + @ClassKey(KeyguardViewConfigurator.class) + abstract CoreStartable bindKeyguardViewConfigurator(KeyguardViewConfigurator impl); + /** Inject into LocskcreenWallpaper. */ @Binds @IntoMap -- cgit v1.2.3 From 463f44fb4e6bcdad3f1e60e9bdf0c1d3b58832c0 Mon Sep 17 00:00:00 2001 From: Daniel Chapin Date: Wed, 18 Oct 2023 15:26:00 +0000 Subject: Revert "Add KeyguardViewConfigurator to SystemUi Go" Revert submission 25007252-release_migrate_split_keyguard_bottom_area Reason for revert: Droidfood blocking bug: b/306101773 Reverted changes: /q/submissionid:25007252-release_migrate_split_keyguard_bottom_area Change-Id: I58390add34331404df717fe5f2c70bf15f1a592f --- src/com/android/systemui/go/SystemUIGoCoreStartableModule.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/com/android/systemui/go/SystemUIGoCoreStartableModule.java b/src/com/android/systemui/go/SystemUIGoCoreStartableModule.java index 1c0308f..c5b250b 100644 --- a/src/com/android/systemui/go/SystemUIGoCoreStartableModule.java +++ b/src/com/android/systemui/go/SystemUIGoCoreStartableModule.java @@ -29,7 +29,6 @@ import com.android.systemui.clipboardoverlay.ClipboardListener; import com.android.systemui.dagger.qualifiers.PerUser; import com.android.systemui.globalactions.GlobalActionsComponent; import com.android.systemui.keyboard.KeyboardUI; -import com.android.systemui.keyguard.KeyguardViewConfigurator; import com.android.systemui.keyguard.KeyguardViewMediator; import com.android.systemui.log.SessionTracker; import com.android.systemui.media.RingtonePlayer; @@ -201,11 +200,6 @@ abstract class SystemUIGoCoreStartableModule { @ClassKey(WMShell.class) abstract CoreStartable bindWMShell(WMShell wmShell); - @Binds - @IntoMap - @ClassKey(KeyguardViewConfigurator.class) - abstract CoreStartable bindKeyguardViewConfigurator(KeyguardViewConfigurator impl); - /** Inject into LocskcreenWallpaper. */ @Binds @IntoMap -- cgit v1.2.3 From 858dff82b2143aed96c490506cff11107d069f3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Pomini?= Date: Thu, 12 Oct 2023 18:47:50 +0000 Subject: Remove LWP flag, SysuiGo side Bug: 273443374 Test: atest WallpaperManagerTest Change-Id: I80d9c7b995d5bab2076f82c1f21d2f8165500046 --- src/com/android/systemui/go/SystemUIGoCoreStartableModule.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/com/android/systemui/go/SystemUIGoCoreStartableModule.java b/src/com/android/systemui/go/SystemUIGoCoreStartableModule.java index c5b250b..c30d5c0 100644 --- a/src/com/android/systemui/go/SystemUIGoCoreStartableModule.java +++ b/src/com/android/systemui/go/SystemUIGoCoreStartableModule.java @@ -36,7 +36,6 @@ import com.android.systemui.power.PowerUI; import com.android.systemui.recents.Recents; import com.android.systemui.shortcut.ShortcutKeyDispatcher; import com.android.systemui.statusbar.notification.InstantAppNotifier; -import com.android.systemui.statusbar.phone.LockscreenWallpaper; import com.android.systemui.statusbar.phone.ScrimController; import com.android.systemui.statusbar.phone.StatusBarHeadsUpChangeListener; import com.android.systemui.theme.ThemeOverlayController; @@ -200,12 +199,6 @@ abstract class SystemUIGoCoreStartableModule { @ClassKey(WMShell.class) abstract CoreStartable bindWMShell(WMShell wmShell); - /** Inject into LocskcreenWallpaper. */ - @Binds - @IntoMap - @ClassKey(LockscreenWallpaper.class) - abstract CoreStartable bindLockscreenWallpaper(LockscreenWallpaper lockscreenWallpaper); - /** Inject into ScrimController. */ @Binds @IntoMap -- cgit v1.2.3 From ea2156537b5753d3b882de223b8139f4d2834704 Mon Sep 17 00:00:00 2001 From: Johannes Gallmann Date: Mon, 30 Oct 2023 09:21:39 +0000 Subject: Clean up PLUG_IN_STATUS_BAR_CHIP flag Bug: 265892345 Flag: LEGACY PLUG_IN_STATUS_BAR_CHIP ENABLED Test: atest SystemStatusAnimationSchedulerImplTest; successful build; manual, i.e. testing that feature is enabled and works correctly Change-Id: Ib0f8896bd4e2a979dc7b48bb77b209fb79505e5b --- src/com/android/systemui/go/SystemUIGoModule.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/com/android/systemui/go/SystemUIGoModule.java b/src/com/android/systemui/go/SystemUIGoModule.java index e73993f..6f9a43a 100644 --- a/src/com/android/systemui/go/SystemUIGoModule.java +++ b/src/com/android/systemui/go/SystemUIGoModule.java @@ -55,7 +55,6 @@ import com.android.systemui.statusbar.NotificationLockscreenUserManager; import com.android.systemui.statusbar.NotificationLockscreenUserManagerImpl; import com.android.systemui.statusbar.NotificationShadeWindowController; import com.android.systemui.statusbar.dagger.StartCentralSurfacesModule; -import com.android.systemui.statusbar.events.StatusBarEventsModule; 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; @@ -101,7 +100,6 @@ import dagger.Provides; ShadeModule.class, ShutdownUiModule.class, StartCentralSurfacesModule.class, - StatusBarEventsModule.class, WallpaperModule.class, VolumeModule.class }) -- cgit v1.2.3 From 174049b7b59bc67dcc86d038e4b5b2eb08dfbd76 Mon Sep 17 00:00:00 2001 From: Johannes Gallmann Date: Wed, 1 Nov 2023 21:11:40 +0000 Subject: Revert "Clean up PLUG_IN_STATUS_BAR_CHIP flag" Revert submission 25213515-plug-in-chip-flag-cleanup Reason for revert: broken builds Reverted changes: /q/submissionid:25213515-plug-in-chip-flag-cleanup Change-Id: I9b117c5c41cd1f9aa54cf714dc99daafc7907faa --- src/com/android/systemui/go/SystemUIGoModule.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/com/android/systemui/go/SystemUIGoModule.java b/src/com/android/systemui/go/SystemUIGoModule.java index 6f9a43a..e73993f 100644 --- a/src/com/android/systemui/go/SystemUIGoModule.java +++ b/src/com/android/systemui/go/SystemUIGoModule.java @@ -55,6 +55,7 @@ import com.android.systemui.statusbar.NotificationLockscreenUserManager; import com.android.systemui.statusbar.NotificationLockscreenUserManagerImpl; import com.android.systemui.statusbar.NotificationShadeWindowController; import com.android.systemui.statusbar.dagger.StartCentralSurfacesModule; +import com.android.systemui.statusbar.events.StatusBarEventsModule; 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; @@ -100,6 +101,7 @@ import dagger.Provides; ShadeModule.class, ShutdownUiModule.class, StartCentralSurfacesModule.class, + StatusBarEventsModule.class, WallpaperModule.class, VolumeModule.class }) -- cgit v1.2.3 From 4fcd781d8eac27db5edfe7cc9550d7abd5a1f524 Mon Sep 17 00:00:00 2001 From: Johannes Gallmann Date: Thu, 2 Nov 2023 10:48:50 +0000 Subject: Revert^2 "Clean up PLUG_IN_STATUS_BAR_CHIP flag" 174049b7b59bc67dcc86d038e4b5b2eb08dfbd76 Change-Id: Iea2ff64d14391ad71fc5c2ad989cf20763b02003 --- src/com/android/systemui/go/SystemUIGoModule.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/com/android/systemui/go/SystemUIGoModule.java b/src/com/android/systemui/go/SystemUIGoModule.java index e73993f..6f9a43a 100644 --- a/src/com/android/systemui/go/SystemUIGoModule.java +++ b/src/com/android/systemui/go/SystemUIGoModule.java @@ -55,7 +55,6 @@ import com.android.systemui.statusbar.NotificationLockscreenUserManager; import com.android.systemui.statusbar.NotificationLockscreenUserManagerImpl; import com.android.systemui.statusbar.NotificationShadeWindowController; import com.android.systemui.statusbar.dagger.StartCentralSurfacesModule; -import com.android.systemui.statusbar.events.StatusBarEventsModule; 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; @@ -101,7 +100,6 @@ import dagger.Provides; ShadeModule.class, ShutdownUiModule.class, StartCentralSurfacesModule.class, - StatusBarEventsModule.class, WallpaperModule.class, VolumeModule.class }) -- cgit v1.2.3 From 4fe3fd8b9e2d951d921cc082cc089b2552059699 Mon Sep 17 00:00:00 2001 From: Candice Lo Date: Mon, 13 Nov 2023 09:28:43 +0000 Subject: refactor(magnification): Renaming WindowMagnification class as Magnification The class WindowMagnification handles not only the window mode, but also the fullscreen mode and mode switch. Therefore, we would like to rename the class to improve the readability of our codebase and avoid confusion. Bug: 310109308 Test: Presubmit. Renaming the class Flag: NA Change-Id: I49d8e0f48783cf0b98a9831ef4a6a850f33e13d8 --- src/com/android/systemui/go/SystemUIGoCoreStartableModule.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/com/android/systemui/go/SystemUIGoCoreStartableModule.java b/src/com/android/systemui/go/SystemUIGoCoreStartableModule.java index c30d5c0..0ca6f22 100644 --- a/src/com/android/systemui/go/SystemUIGoCoreStartableModule.java +++ b/src/com/android/systemui/go/SystemUIGoCoreStartableModule.java @@ -22,7 +22,7 @@ import com.android.systemui.LatencyTester; import com.android.systemui.ScreenDecorations; import com.android.systemui.SliceBroadcastRelayHandler; import com.android.systemui.accessibility.SystemActions; -import com.android.systemui.accessibility.WindowMagnification; +import com.android.systemui.accessibility.Magnification; import com.android.systemui.back.domain.interactor.BackActionInteractor; import com.android.systemui.biometrics.AuthController; import com.android.systemui.clipboardoverlay.ClipboardListener; @@ -187,11 +187,11 @@ abstract class SystemUIGoCoreStartableModule { @ClassKey(VolumeUI.class) abstract CoreStartable bindVolumeUI(VolumeUI volumeUi); - /** Inject into WindowMagnification. */ + /** Inject into Magnification. */ @Binds @IntoMap - @ClassKey(WindowMagnification.class) - abstract CoreStartable bindWindowMagnification(WindowMagnification windowMagnification); + @ClassKey(Magnification.class) + abstract CoreStartable bindMagnification(Magnification magnification); /** Inject into WMShell. */ @Binds -- cgit v1.2.3 From 527f9f9010f210cd07686e53cb0ec5219f1561d4 Mon Sep 17 00:00:00 2001 From: Brad Hinegardner Date: Wed, 6 Dec 2023 16:06:38 +0000 Subject: Add KeyguardViewConfigurator to SystemUi Go When keyguardBottomAreaRefactor flag is on, this will be required Bug: 314823675 Flag: NONE Test: turn keyguardBottomAreaRefactor flag on, build for mokey_go32 Change-Id: I17927c49b346d9fc6da4e68e6defd0c8bbda78f6 --- src/com/android/systemui/go/SystemUIGoCoreStartableModule.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/com/android/systemui/go/SystemUIGoCoreStartableModule.java b/src/com/android/systemui/go/SystemUIGoCoreStartableModule.java index 0ca6f22..1c666ed 100644 --- a/src/com/android/systemui/go/SystemUIGoCoreStartableModule.java +++ b/src/com/android/systemui/go/SystemUIGoCoreStartableModule.java @@ -29,6 +29,7 @@ import com.android.systemui.clipboardoverlay.ClipboardListener; import com.android.systemui.dagger.qualifiers.PerUser; import com.android.systemui.globalactions.GlobalActionsComponent; import com.android.systemui.keyboard.KeyboardUI; +import com.android.systemui.keyguard.KeyguardViewConfigurator; import com.android.systemui.keyguard.KeyguardViewMediator; import com.android.systemui.log.SessionTracker; import com.android.systemui.media.RingtonePlayer; @@ -199,6 +200,11 @@ abstract class SystemUIGoCoreStartableModule { @ClassKey(WMShell.class) abstract CoreStartable bindWMShell(WMShell wmShell); + @Binds + @IntoMap + @ClassKey(KeyguardViewConfigurator.class) + abstract CoreStartable bindKeyguardViewConfigurator(KeyguardViewConfigurator impl); + /** Inject into ScrimController. */ @Binds @IntoMap -- cgit v1.2.3