SystemUIGoogle: Initial update for U QPR2
Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
diff --git a/SystemUIGoogle/Android.bp b/SystemUIGoogle/Android.bp
index 763e93c..c1f94a0 100644
--- a/SystemUIGoogle/Android.bp
+++ b/SystemUIGoogle/Android.bp
@@ -23,18 +23,14 @@
"vendor-pixelatoms-java",
"smartspace-proto-java",
"guava",
- "matchmaker-lib",
- "touchcontext-lib",
"googlebattery-lib",
- "nga-lib",
- "columbus-lib",
"google-battery",
"vendor.google.google_battery-V1-java",
],
manifest: "AndroidManifest.xml",
javacflags: ["-Adagger.fastInit=enabled"],
- kotlincflags: ["-Xjvm-default=enable"],
+ kotlincflags: ["-Xjvm-default=all"],
plugins: ["dagger2-compiler"],
lint: {
@@ -44,7 +40,9 @@
android_app {
name: "SystemUIGoogle",
- defaults: ["platform_app_defaults"],
+ defaults: [
+ "platform_app_defaults",
+ ],
static_libs: [
"SystemUIGoogle-core",
],
@@ -66,8 +64,12 @@
proguard_flags_files: ["proguard.flags"],
},
+ libs: [
+ "ims-common",
+ ],
+
javacflags: ["-Adagger.fastInit=enabled"],
- kotlincflags: ["-Xjvm-default=enable"],
+ kotlincflags: ["-Xjvm-default=all"],
dxflags: ["--multi-dex"],
required: [
@@ -77,3 +79,17 @@
"SystemUI",
],
}
+
+java_library {
+ name: "google-battery",
+ srcs: ["googlebattery/src/**/*.java"],
+ static_libs: [
+ "vendor.google.google_battery-V1-java",
+ ],
+}
+
+java_import {
+ name: "googlebattery-lib",
+ sdk_version: "current",
+ jars: ["libs/googlebattery.jar"],
+}
diff --git a/SystemUIGoogle/AndroidManifest.xml b/SystemUIGoogle/AndroidManifest.xml
index 25a4421..a33e416 100644
--- a/SystemUIGoogle/AndroidManifest.xml
+++ b/SystemUIGoogle/AndroidManifest.xml
@@ -13,8 +13,6 @@
<uses-permission android:name="android.permission.USE_COLORIZED_NOTIFICATIONS"/>
<permission android:name="com.android.systemui.permission.SEND_ALERT_BROADCASTS" android:protectionLevel="preinstalled|signature"/>
<uses-permission android:name="com.google.android.deskclock.permission.RECEIVE_ALERT_BROADCASTS"/>
- <permission android:name="com.google.android.columbus.permission.CONFIGURE_COLUMBUS_GESTURE" android:protectionLevel="preinstalled|signature"/>
- <uses-permission android:name="com.google.android.columbus.permission.CONFIGURE_COLUMBUS_GESTURE"/>
<uses-permission android:name="com.google.restricted_assist_gesture.permission.RESTRICTED_ASSIST_GESTURE_PROVIDER"/>
<permission android:name="com.google.android.ambientindication.permission.AMBIENT_INDICATION" android:protectionLevel="privileged|signature"/>
<uses-permission android:name="com.google.android.apps.nexuslauncher.permission.QSB"/>
@@ -89,13 +87,6 @@
android:exported="true"
android:grantUriPermissions="true">
</provider>
-
- <service android:exported="true" android:name="com.google.android.systemui.columbus.ColumbusServiceProxy" android:permission="com.google.android.columbus.permission.CONFIGURE_COLUMBUS_GESTURE"/>
- <service android:exported="true" android:name="org.pixelexperience.systemui.columbus.ColumbusTargetRequestServiceWrapper">
- <intent-filter>
- <action android:name="com.google.android.systemui.QUICK_TAP_TARGET_REQUEST"/>
- </intent-filter>
- </service>
<!--service android:exported="true" android:name="com.google.android.systemui.power.batteryhealth.HealthService"/>
<receiver android:exported="true" android:name="com.google.android.systemui.power.batteryhealth.HealthUpdateReceiver"/>
<service android:enabled="false" android:exported="false" android:name="com.google.android.systemui.lowlightclock.LowLightClockDreamService" android:permission="android.permission.BIND_DREAM_SERVICE">
diff --git a/SystemUIGoogle/googlebattery/src/com/google/android/systemui/googlebattery/AdaptiveChargingManager.java b/SystemUIGoogle/googlebattery/src/com/google/android/systemui/googlebattery/AdaptiveChargingManager.java
index 3bd7d96..0b554c3 100644
--- a/SystemUIGoogle/googlebattery/src/com/google/android/systemui/googlebattery/AdaptiveChargingManager.java
+++ b/SystemUIGoogle/googlebattery/src/com/google/android/systemui/googlebattery/AdaptiveChargingManager.java
@@ -136,8 +136,8 @@
public void queryStatus(final AdaptiveChargingStatusReceiver adaptiveChargingStatusReceiver) {
IBinder.DeathRecipient deathRecipient = new IBinder.DeathRecipient() {
- @Override
- public final void binderDied() {
+ @Override
+ public void binderDied() {
if (DEBUG) {
Log.d("AdaptiveChargingManager", "serviceDied");
}
@@ -145,20 +145,25 @@
}
};
IGoogleBattery initHalInterface = null;
- if(mHasSystemFeature) {
- initHalInterface = GoogleBatteryManager.initHalInterface(deathRecipient);
+ if (mHasSystemFeature) {
+ try {
+ initHalInterface = GoogleBatteryManager.initHalInterface(deathRecipient);
+ } catch (SecurityException e) {
+ Log.e("AdaptiveChargingManager", "Failed to initialize HAL interface: SecurityException", e);
+ return;
+ }
}
if (initHalInterface == null) {
- adaptiveChargingStatusReceiver.onDestroyInterface();
return;
}
try {
ChargingStage stage = initHalInterface.getChargingStageAndDeadline();
adaptiveChargingStatusReceiver.onReceiveStatus(stage.deadlineSecs, stage.stage);
} catch (RemoteException | ParcelFormatException e) {
- Log.e("AdaptiveChargingManager", "Failed to get Adaptive Charging status: ", e);
+ Log.e("AdaptiveChargingManager", "Failed to get Adaptive Charging status", e);
+ } finally {
+ GoogleBatteryManager.destroyHalInterface(initHalInterface, deathRecipient);
+ adaptiveChargingStatusReceiver.onDestroyInterface();
}
- GoogleBatteryManager.destroyHalInterface(initHalInterface, deathRecipient);
- adaptiveChargingStatusReceiver.onDestroyInterface();
}
}
diff --git a/SystemUIGoogle/googlebattery/src/com/google/android/systemui/googlebattery/GoogleBatteryManager.java b/SystemUIGoogle/googlebattery/src/com/google/android/systemui/googlebattery/GoogleBatteryManager.java
index b2ec5a7..7810dfc 100644
--- a/SystemUIGoogle/googlebattery/src/com/google/android/systemui/googlebattery/GoogleBatteryManager.java
+++ b/SystemUIGoogle/googlebattery/src/com/google/android/systemui/googlebattery/GoogleBatteryManager.java
@@ -34,7 +34,9 @@
allowBlocking.linkToDeath(deathRecipient, 0);
}
return asInterface;
- } catch (RemoteException | SecurityException | NoSuchElementException e) {
+
+ } catch (Exception e) {
+ Log.e("GoogleBatteryManager", "Error initializing HAL interface", e);
return null;
}
}
diff --git a/SystemUIGoogle/interfaces/libs/googlebattery.jar b/SystemUIGoogle/libs/googlebattery.jar
similarity index 100%
rename from SystemUIGoogle/interfaces/libs/googlebattery.jar
rename to SystemUIGoogle/libs/googlebattery.jar
Binary files differ
diff --git a/SystemUIGoogle/res/values/ids.xml b/SystemUIGoogle/res/values/ids.xml
index 7fde1c6..8d43c3e 100644
--- a/SystemUIGoogle/res/values/ids.xml
+++ b/SystemUIGoogle/res/values/ids.xml
@@ -24,6 +24,7 @@
<item type="id" name="debug_container"/>
<item type="id" name="dock_promo"/>
<item type="id" name="docked_top_icon"/>
+ <item type="id" name="dnd_icon"/>
<item type="id" name="dream_status_bar_item_cast_name"/>
<item type="id" name="dreamliner_arrow"/>
<item type="id" name="dreamliner_gear"/>
@@ -106,4 +107,4 @@
<item type="id" name="yellow_glow"/>
<item type="id" name="zerostate"/>
<item type="id" name="zerostate_icon_image"/>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/SystemUIGoogle/src/com/google/android/systemui/GoogleServices.java b/SystemUIGoogle/src/com/google/android/systemui/GoogleServices.java
index a838b40..c74dd44 100644
--- a/SystemUIGoogle/src/com/google/android/systemui/GoogleServices.java
+++ b/SystemUIGoogle/src/com/google/android/systemui/GoogleServices.java
@@ -3,16 +3,13 @@
import android.app.AlarmManager;
import android.content.Context;
-import com.android.systemui.R;
+import com.android.systemui.res.R;
import com.android.systemui.qs.QsEventLogger;
import com.android.systemui.VendorServices;
import com.android.systemui.statusbar.phone.CentralSurfaces;
import com.google.android.systemui.ambientmusic.AmbientIndicationContainer;
import com.google.android.systemui.ambientmusic.AmbientIndicationService;
-import com.google.android.systemui.input.TouchContextService;
-import com.google.android.systemui.columbus.ColumbusContext;
-import com.google.android.systemui.columbus.ColumbusServiceWrapper;
import java.util.ArrayList;
@@ -26,27 +23,19 @@
private final CentralSurfaces mCentralSurfaces;
private final AlarmManager mAlarmManager;
private final QsEventLogger mUiEventLogger;
- private final Lazy<ColumbusServiceWrapper> mColumbusServiceLazy;
@Inject
- public GoogleServices(Context context, AlarmManager alarmManager, CentralSurfaces centralSurfaces, QsEventLogger uiEventLogger, Lazy<ColumbusServiceWrapper> columbusServiceWrapperLazy) {
+ public GoogleServices(Context context, AlarmManager alarmManager, CentralSurfaces centralSurfaces, QsEventLogger uiEventLogger) {
super();
mContext = context;
mServices = new ArrayList<>();
mAlarmManager = alarmManager;
mCentralSurfaces = centralSurfaces;
mUiEventLogger = uiEventLogger;
- mColumbusServiceLazy = columbusServiceWrapperLazy;
}
@Override
public void start() {
- if (new ColumbusContext(mContext).isAvailable()) {
- addService(mColumbusServiceLazy.get());
- }
- if (mContext.getResources().getBoolean(R.bool.config_touch_context_enabled)) {
- addService(new TouchContextService(mContext));
- }
AmbientIndicationContainer ambientIndicationContainer = (AmbientIndicationContainer) mCentralSurfaces.getNotificationShadeWindowView().findViewById(R.id.ambient_indication_container);
ambientIndicationContainer.initializeView(mContext, mCentralSurfaces, ambientIndicationContainer);
addService(new AmbientIndicationService(mContext, ambientIndicationContainer, mAlarmManager));
diff --git a/SystemUIGoogle/src/com/google/android/systemui/NotificationLockscreenUserManagerGoogle.java b/SystemUIGoogle/src/com/google/android/systemui/NotificationLockscreenUserManagerGoogle.java
index 37fb83b..3d20790 100644
--- a/SystemUIGoogle/src/com/google/android/systemui/NotificationLockscreenUserManagerGoogle.java
+++ b/SystemUIGoogle/src/com/google/android/systemui/NotificationLockscreenUserManagerGoogle.java
@@ -24,9 +24,11 @@
import com.android.internal.widget.LockPatternUtils;
import com.android.systemui.broadcast.BroadcastDispatcher;
import com.android.systemui.dagger.SysUISingleton;
+import com.android.systemui.dagger.qualifiers.Background;
import com.android.systemui.dagger.qualifiers.Main;
import com.android.systemui.dump.DumpManager;
import com.android.systemui.flags.FeatureFlags;
+import com.android.systemui.flags.FeatureFlagsClassic;
import com.android.systemui.plugins.statusbar.StatusBarStateController;
import com.android.systemui.recents.OverviewProxyService;
import com.android.systemui.statusbar.NotificationClickNotifier;
@@ -41,6 +43,7 @@
import com.google.android.systemui.smartspace.SmartSpaceController;
import dagger.Lazy;
import javax.inject.Inject;
+import java.util.concurrent.Executor;
@SysUISingleton
public final class NotificationLockscreenUserManagerGoogle extends NotificationLockscreenUserManagerImpl {
@@ -50,18 +53,31 @@
public final SmartSpaceController mSmartSpaceController;
@Inject
- public NotificationLockscreenUserManagerGoogle(Context context, BroadcastDispatcher broadcastDispatcher,
- DevicePolicyManager devicePolicyManager, UserManager userManager, UserTracker userTracker,
- Lazy<NotificationVisibilityProvider> visibilityProviderLazy,
- Lazy<CommonNotifCollection> commonNotifCollectionLazy, NotificationClickNotifier clickNotifier,
- Lazy<OverviewProxyService> overviewProxyServiceLazy, KeyguardManager keyguardManager,
- StatusBarStateController statusBarStateController, @Main Handler mainHandler,
- DeviceProvisionedController deviceProvisionedController, KeyguardStateController keyguardStateController,
- Lazy<KeyguardBypassController> keyguardBypassController, SmartSpaceController smartSpaceController,
- SecureSettings secureSettings, DumpManager dumpManager, LockPatternUtils lockPatternUtils, FeatureFlags featureFlags) {
+ public NotificationLockscreenUserManagerGoogle(Context context,
+ BroadcastDispatcher broadcastDispatcher,
+ DevicePolicyManager devicePolicyManager,
+ UserManager userManager,
+ UserTracker userTracker,
+ Lazy<NotificationVisibilityProvider> visibilityProviderLazy,
+ Lazy<CommonNotifCollection> commonNotifCollectionLazy,
+ NotificationClickNotifier clickNotifier,
+ Lazy<OverviewProxyService> overviewProxyServiceLazy,
+ KeyguardManager keyguardManager,
+ StatusBarStateController statusBarStateController,
+ @Main Handler mainHandler,
+ @Background Handler backgroundHandler,
+ @Background Executor backgroundExecutor,
+ DeviceProvisionedController deviceProvisionedController,
+ KeyguardStateController keyguardStateController,
+ SecureSettings secureSettings,
+ DumpManager dumpManager,
+ LockPatternUtils lockPatternUtils,
+ FeatureFlagsClassic featureFlags,
+ Lazy<KeyguardBypassController> keyguardBypassController,
+ SmartSpaceController smartSpaceController) {
super(context, broadcastDispatcher, devicePolicyManager, userManager, userTracker, visibilityProviderLazy,
commonNotifCollectionLazy, clickNotifier, overviewProxyServiceLazy, keyguardManager, statusBarStateController,
- mainHandler, deviceProvisionedController, keyguardStateController, secureSettings, dumpManager, lockPatternUtils, featureFlags);
+ mainHandler, backgroundHandler, backgroundExecutor, deviceProvisionedController, keyguardStateController, secureSettings, dumpManager, lockPatternUtils, featureFlags);
KeyguardStateController.Callback callback = new KeyguardStateController.Callback() {
public void onKeyguardShowingChanged() {
NotificationLockscreenUserManagerGoogle.this.updateSmartSpaceVisibilitySettings();
@@ -73,13 +89,12 @@
this.mKeyguardStateController = keyguardStateController;
this.mKeyguardStateController.addCallback(callback);
}
-
public void updateSmartSpaceVisibilitySettings() {
boolean hideNotifs = false;
boolean hideSensitive = !userAllowsPrivateNotificationsInPublic(this.mCurrentUserId) && (isAnyProfilePublicMode() || !this.mKeyguardStateController.isShowing());
boolean hideWork = !allowsManagedPrivateNotificationsInPublic();
if (!((KeyguardBypassController) this.mKeyguardBypassControllerLazy.get()).getBypassEnabled()) {
- if (hideWork && (isAnyManagedProfilePublicMode() || !this.mKeyguardStateController.isShowing())) {
+ if (hideWork && (isAnyProfilePublicMode() || !this.mKeyguardStateController.isShowing())) {
hideNotifs = true;
}
hideWork = hideNotifs;
diff --git a/SystemUIGoogle/src/com/google/android/systemui/controls/GoogleControlsTileResourceConfiguration.kt b/SystemUIGoogle/src/com/google/android/systemui/controls/GoogleControlsTileResourceConfiguration.kt
index 66c29b0..d4ac51a 100644
--- a/SystemUIGoogle/src/com/google/android/systemui/controls/GoogleControlsTileResourceConfiguration.kt
+++ b/SystemUIGoogle/src/com/google/android/systemui/controls/GoogleControlsTileResourceConfiguration.kt
@@ -5,7 +5,7 @@
import com.android.systemui.controls.controller.ControlsController
import com.android.systemui.controls.controller.ControlsTileResourceConfiguration
import com.android.systemui.dagger.SysUISingleton
-import com.android.systemui.R
+import com.android.systemui.res.R
import javax.inject.Inject
diff --git a/SystemUIGoogle/src/com/google/android/systemui/dagger/SystemUIGoogleBinder.java b/SystemUIGoogle/src/com/google/android/systemui/dagger/SystemUIGoogleBinder.java
index e05018e..60bbabf 100644
--- a/SystemUIGoogle/src/com/google/android/systemui/dagger/SystemUIGoogleBinder.java
+++ b/SystemUIGoogle/src/com/google/android/systemui/dagger/SystemUIGoogleBinder.java
@@ -19,7 +19,6 @@
import com.android.systemui.keyguard.dagger.KeyguardModule;
import com.android.systemui.recents.RecentsModule;
import com.google.android.systemui.statusbar.dagger.CentralSurfacesGoogleModule;
-import com.google.android.systemui.columbus.dagger.ColumbusBinderModule;
import dagger.Module;
@@ -30,7 +29,6 @@
RecentsModule.class,
CentralSurfacesGoogleModule.class,
KeyguardModule.class,
- ColumbusBinderModule.class,
})
public abstract class SystemUIGoogleBinder {
}
diff --git a/SystemUIGoogle/src/com/google/android/systemui/dagger/SystemUIGoogleComponent.kt b/SystemUIGoogle/src/com/google/android/systemui/dagger/SystemUIGoogleComponent.kt
index 1bf9da2..731aaa7 100644
--- a/SystemUIGoogle/src/com/google/android/systemui/dagger/SystemUIGoogleComponent.kt
+++ b/SystemUIGoogle/src/com/google/android/systemui/dagger/SystemUIGoogleComponent.kt
@@ -21,7 +21,6 @@
import com.android.systemui.globalactions.ShutdownUiModule
import com.android.systemui.recents.RecentsModule
import com.android.systemui.keyguard.CustomizationProvider
-import com.android.systemui.shade.ShadeModule
import com.android.systemui.statusbar.NotificationInsetsModule
import com.android.systemui.statusbar.QsFrameTranslateModule
import com.android.systemui.keyguard.KeyguardSliceProvider
@@ -39,7 +38,6 @@
DependencyProvider::class,
NotificationInsetsModule::class,
QsFrameTranslateModule::class,
- ShadeModule::class,
ShutdownUiModule::class,
SystemUIGoogleBinder::class,
SystemUIModule::class,
diff --git a/SystemUIGoogle/src/com/google/android/systemui/dagger/SystemUIGoogleCoreStartableModule.kt b/SystemUIGoogle/src/com/google/android/systemui/dagger/SystemUIGoogleCoreStartableModule.kt
index d4074b9..4397ae6 100644
--- a/SystemUIGoogle/src/com/google/android/systemui/dagger/SystemUIGoogleCoreStartableModule.kt
+++ b/SystemUIGoogle/src/com/google/android/systemui/dagger/SystemUIGoogleCoreStartableModule.kt
@@ -22,7 +22,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.accessibility.Magnification
import com.android.systemui.biometrics.AuthController
import com.android.systemui.biometrics.BiometricNotificationService
import com.android.systemui.clipboardoverlay.ClipboardListener
@@ -49,7 +49,6 @@
import com.android.systemui.shortcut.ShortcutKeyDispatcher
import com.android.systemui.statusbar.notification.InstantAppNotifier
import com.android.systemui.statusbar.phone.KeyguardLiftController
-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.stylus.StylusUsiPowerStartable
@@ -227,11 +226,11 @@
@ClassKey(VolumeUI::class)
abstract fun bindVolumeUI(sysui: VolumeUI): CoreStartable
- /** Inject into WindowMagnification. */
+ /** Inject into Magnification. */
@Binds
@IntoMap
- @ClassKey(WindowMagnification::class)
- abstract fun bindWindowMagnification(sysui: WindowMagnification): CoreStartable
+ @ClassKey(Magnification::class)
+ abstract fun Magnification(sysui: Magnification): CoreStartable
/** Inject into WMShell. */
@Binds
@@ -317,11 +316,6 @@
@Binds
@IntoMap
- @ClassKey(LockscreenWallpaper::class)
- abstract fun bindLockscreenWallpaper(impl: LockscreenWallpaper): CoreStartable
-
- @Binds
- @IntoMap
@ClassKey(ScrimController::class)
abstract fun bindScrimController(impl: ScrimController): CoreStartable
diff --git a/SystemUIGoogle/src/com/google/android/systemui/dagger/SystemUIGoogleModule.java b/SystemUIGoogle/src/com/google/android/systemui/dagger/SystemUIGoogleModule.java
index 82c43fb..81e36b6 100644
--- a/SystemUIGoogle/src/com/google/android/systemui/dagger/SystemUIGoogleModule.java
+++ b/SystemUIGoogle/src/com/google/android/systemui/dagger/SystemUIGoogleModule.java
@@ -28,7 +28,6 @@
import com.android.systemui.qs.QsEventLogger;
import com.android.keyguard.KeyguardViewController;
-import com.android.systemui.assist.AssistManager;
import com.android.systemui.broadcast.BroadcastDispatcher;
import com.android.systemui.controls.controller.ControlsTileResourceConfiguration;
import com.android.systemui.dagger.SysUISingleton;
@@ -63,15 +62,13 @@
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.KeyguardBypassController;
import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;
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;
@@ -80,13 +77,18 @@
import com.android.systemui.rotationlock.RotationLockModule;
import com.android.systemui.statusbar.policy.AospPolicyModule;
+import com.android.systemui.battery.BatterySaverModule;
+import com.android.systemui.settings.dagger.MultiUserUtilsModule;
+import com.android.systemui.statusbar.phone.fragment.CollapsedStatusBarFragmentStartableModule;
+import com.android.systemui.shade.ShadeModule;
+import com.android.systemui.scene.SceneContainerFrameworkModule;
+import com.android.systemui.navigationbar.NavigationBarControllerModule;
+import com.android.systemui.statusbar.phone.HeadsUpModule;
+import com.android.systemui.wallpapers.dagger.WallpaperModule;
+import com.android.systemui.statusbar.KeyboardShortcutsModule;
+
import com.google.android.systemui.NotificationLockscreenUserManagerGoogle;
-import com.google.android.systemui.assist.AssistManagerGoogle;
-import com.google.android.systemui.assist.dagger.AssistModule;
-import com.google.android.systemui.columbus.dagger.ColumbusModule;
import com.google.android.systemui.controls.GoogleControlsTileResourceConfigurationImpl;
-import com.google.android.systemui.dreamliner.DockObserver;
-import com.google.android.systemui.dreamliner.dagger.DreamlinerModule;
import com.google.android.systemui.power.dagger.PowerModuleGoogle;
import com.google.android.systemui.qs.dagger.QSModuleGoogle;
import com.google.android.systemui.qs.tileimpl.QSFactoryImplGoogle;
@@ -109,24 +111,29 @@
import dagger.Lazy;
@Module(includes = {
+ CollapsedStatusBarFragmentStartableModule.class,
GestureModule.class,
+ HeadsUpModule.class,
MediaModule.class,
+ MultiUserUtilsModule.class,
+ NavigationBarControllerModule.class,
+ ShadeModule.class,
+ ReferenceScreenshotModule.class,
+ RotationLockModule.class,
+ SceneContainerFrameworkModule.class,
+ VolumeModule.class,
+ WallpaperModule.class,
+ KeyboardShortcutsModule.class,
GoogleQSModule.class,
PowerModuleGoogle.class,
QSModuleGoogle.class,
- ReferenceScreenshotModule.class,
StartCentralSurfacesGoogleModule.class,
- VolumeModule.class,
SmartspaceGoogleModule.class,
- DreamlinerModule.class,
ReverseChargingModule.class,
- AssistModule.class,
- ColumbusModule.class,
- StatusBarEventsModule.class,
SystemUIGooglePolicyModule.class,
- RotationLockModule.class,
LineageModule.class
})
+
public abstract class SystemUIGoogleModule {
@SysUISingleton
@@ -166,38 +173,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,
- QsEventLogger 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,
@@ -228,7 +203,7 @@
abstract KeyguardIndicationController bindKeyguardIndicationControllerGoogle(KeyguardIndicationControllerGoogle keyguardIndicationControllerGoogle);
@Binds
- abstract DockManager bindDockManager(DockObserver dockObserver);
+ abstract DockManager bindDockManager(DockManagerImpl dockManager);
/** */
@Binds
@@ -236,10 +211,6 @@
public abstract QSFactory bindQSFactoryGoogle(QSFactoryImplGoogle qsFactoryImpl);
@Binds
- @SysUISingleton
- abstract AssistManager bindAssistManagerGoogle(AssistManagerGoogle assistManager);
-
- @Binds
abstract ControlsTileResourceConfiguration bindControlsTileResourceConfiguration(GoogleControlsTileResourceConfigurationImpl configuration);
@Provides
diff --git a/SystemUIGoogle/src/com/google/android/systemui/keyguard/KeyguardSliceProviderGoogle.kt b/SystemUIGoogle/src/com/google/android/systemui/keyguard/KeyguardSliceProviderGoogle.kt
index 653c84b..b45f788 100644
--- a/SystemUIGoogle/src/com/google/android/systemui/keyguard/KeyguardSliceProviderGoogle.kt
+++ b/SystemUIGoogle/src/com/google/android/systemui/keyguard/KeyguardSliceProviderGoogle.kt
@@ -29,7 +29,7 @@
import androidx.slice.builders.ListBuilder
import androidx.slice.builders.ListBuilder.*
import androidx.slice.builders.SliceAction
-import com.android.systemui.R
+import com.android.systemui.res.R
import com.android.systemui.keyguard.KeyguardSliceProvider
import com.google.android.systemui.smartspace.SmartSpaceCard
import com.google.android.systemui.smartspace.SmartSpaceController
diff --git a/SystemUIGoogle/src/com/google/android/systemui/power/AdaptiveChargingNotification.java b/SystemUIGoogle/src/com/google/android/systemui/power/AdaptiveChargingNotification.java
index badb8fc..9683a22 100644
--- a/SystemUIGoogle/src/com/google/android/systemui/power/AdaptiveChargingNotification.java
+++ b/SystemUIGoogle/src/com/google/android/systemui/power/AdaptiveChargingNotification.java
@@ -25,7 +25,7 @@
import android.os.UserHandle;
import androidx.core.app.NotificationCompat;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.systemui.R;
+import com.android.systemui.res.R;
import com.android.systemui.util.NotificationChannels;
import com.google.android.systemui.googlebattery.AdaptiveChargingManager;
import com.google.android.systemui.power.AdaptiveChargingNotification;
diff --git a/SystemUIGoogle/src/com/google/android/systemui/power/BatteryDefenderNotification.java b/SystemUIGoogle/src/com/google/android/systemui/power/BatteryDefenderNotification.java
index 6ace6eb..882a390 100644
--- a/SystemUIGoogle/src/com/google/android/systemui/power/BatteryDefenderNotification.java
+++ b/SystemUIGoogle/src/com/google/android/systemui/power/BatteryDefenderNotification.java
@@ -32,7 +32,7 @@
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.logging.UiEventLogger;
-import com.android.systemui.R;
+import com.android.systemui.res.R;
import com.android.systemui.util.NotificationChannels;
import java.text.NumberFormat;
diff --git a/SystemUIGoogle/src/com/google/android/systemui/power/EnhancedEstimatesGoogleImpl.kt b/SystemUIGoogle/src/com/google/android/systemui/power/EnhancedEstimatesGoogleImpl.kt
index 4c4a645..f6c5d47 100644
--- a/SystemUIGoogle/src/com/google/android/systemui/power/EnhancedEstimatesGoogleImpl.kt
+++ b/SystemUIGoogle/src/com/google/android/systemui/power/EnhancedEstimatesGoogleImpl.kt
@@ -37,9 +37,8 @@
override fun isHybridNotificationEnabled(): Boolean {
return try {
- mContext.packageManager.getPackageInfo("com.google.android.apps.turbo", 512).applicationInfo.enabled &&
- updateFlags()
- mParser.getBoolean("hybrid_enabled", true)
+ val packageInfo = mContext.packageManager.getPackageInfo("com.google.android.apps.turbo", 512)
+ packageInfo.applicationInfo?.enabled == true && updateFlags() && mParser.getBoolean("hybrid_enabled", true)
} catch (e: PackageManager.NameNotFoundException) {
false
}
diff --git a/SystemUIGoogle/src/com/google/android/systemui/power/PowerUtils.java b/SystemUIGoogle/src/com/google/android/systemui/power/PowerUtils.java
index e2c1656..47bceb0 100644
--- a/SystemUIGoogle/src/com/google/android/systemui/power/PowerUtils.java
+++ b/SystemUIGoogle/src/com/google/android/systemui/power/PowerUtils.java
@@ -26,7 +26,7 @@
import android.text.format.DateFormat;
import androidx.core.app.NotificationCompat;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.systemui.R;
+import com.android.systemui.res.R;
import java.time.Clock;
import java.util.Locale;
diff --git a/SystemUIGoogle/src/com/google/android/systemui/qs/dagger/QSModuleGoogle.java b/SystemUIGoogle/src/com/google/android/systemui/qs/dagger/QSModuleGoogle.java
index 0c015bd..2062b30 100644
--- a/SystemUIGoogle/src/com/google/android/systemui/qs/dagger/QSModuleGoogle.java
+++ b/SystemUIGoogle/src/com/google/android/systemui/qs/dagger/QSModuleGoogle.java
@@ -45,11 +45,18 @@
import com.android.systemui.util.settings.SecureSettings;
import com.android.systemui.qs.tileimpl.QSTileImpl;
+import com.android.systemui.qs.ui.adapter.QSSceneAdapter;
+import com.android.systemui.qs.ui.adapter.QSSceneAdapterImpl;
+import com.android.systemui.qs.dagger.QSFragmentComponent;
+import com.android.systemui.qs.dagger.QSSceneComponent;
+import com.android.systemui.qs.tiles.di.QSTilesModule;
+
import com.google.android.systemui.statusbar.phone.AutoTileManagerGoogle;
import java.util.Map;
import javax.inject.Named;
+import dagger.Binds;
import dagger.Module;
import dagger.Provides;
import dagger.multibindings.Multibinds;
@@ -57,13 +64,14 @@
/**
* Module for QS dependencies
*/
-@Module(subcomponents = {QSFragmentComponent.class},
+@Module(subcomponents = {QSFragmentComponent.class, QSSceneComponent.class},
includes = {
MediaModule.class,
QSExternalModule.class,
QSFlagsModule.class,
QSHostModule.class,
QSPipelineModule.class,
+ QSTilesModule.class,
}
)
public interface QSModuleGoogle {
@@ -112,4 +120,7 @@
manager.init();
return manager;
}
+
+ @Binds
+ QSSceneAdapter bindsQsSceneInteractor(QSSceneAdapterImpl impl);
}
diff --git a/SystemUIGoogle/src/com/google/android/systemui/qs/tileimpl/QSFactoryImplGoogle.java b/SystemUIGoogle/src/com/google/android/systemui/qs/tileimpl/QSFactoryImplGoogle.java
index 019c2db..f7f549e 100644
--- a/SystemUIGoogle/src/com/google/android/systemui/qs/tileimpl/QSFactoryImplGoogle.java
+++ b/SystemUIGoogle/src/com/google/android/systemui/qs/tileimpl/QSFactoryImplGoogle.java
@@ -48,9 +48,9 @@
@Inject
public QSFactoryImplGoogle(
Lazy<QSHost> qsHostLazy,
- Provider<CustomTile.Builder> customTileBuilderProvider,
+ Provider<CustomTile.Factory> customTileFactoryProvider,
Map<String, Provider<QSTileImpl<?>>> tileMap) {
super(qsHostLazy,
- customTileBuilderProvider, tileMap);
+ customTileFactoryProvider, tileMap);
}
}
diff --git a/SystemUIGoogle/src/com/google/android/systemui/qs/tiles/BatterySaverTileGoogle.java b/SystemUIGoogle/src/com/google/android/systemui/qs/tiles/BatterySaverTileGoogle.java
index d8a5b47..6a5ab4e 100644
--- a/SystemUIGoogle/src/com/google/android/systemui/qs/tiles/BatterySaverTileGoogle.java
+++ b/SystemUIGoogle/src/com/google/android/systemui/qs/tiles/BatterySaverTileGoogle.java
@@ -21,7 +21,7 @@
import com.android.internal.logging.MetricsLogger;
import com.android.systemui.dagger.qualifiers.Background;
import com.android.systemui.dagger.qualifiers.Main;
-import com.android.systemui.R;
+import com.android.systemui.res.R;
import com.android.systemui.qs.QsEventLogger;
import com.android.systemui.qs.QSHost;
import com.android.systemui.qs.logging.QSLogger;
diff --git a/SystemUIGoogle/src/com/google/android/systemui/qs/tiles/ReverseChargingTile.java b/SystemUIGoogle/src/com/google/android/systemui/qs/tiles/ReverseChargingTile.java
index 751ac5b..1bb75a9 100644
--- a/SystemUIGoogle/src/com/google/android/systemui/qs/tiles/ReverseChargingTile.java
+++ b/SystemUIGoogle/src/com/google/android/systemui/qs/tiles/ReverseChargingTile.java
@@ -33,7 +33,7 @@
import com.android.systemui.dagger.qualifiers.Background;
import com.android.systemui.dagger.qualifiers.Main;
import com.android.systemui.Prefs;
-import com.android.systemui.R;
+import com.android.systemui.res.R;
import com.android.systemui.qs.QsEventLogger;
import com.android.systemui.qs.QSHost;
import com.android.systemui.qs.logging.QSLogger;
diff --git a/SystemUIGoogle/src/com/google/android/systemui/reversecharging/ReverseChargingController.java b/SystemUIGoogle/src/com/google/android/systemui/reversecharging/ReverseChargingController.java
index d34929e..099a41e 100644
--- a/SystemUIGoogle/src/com/google/android/systemui/reversecharging/ReverseChargingController.java
+++ b/SystemUIGoogle/src/com/google/android/systemui/reversecharging/ReverseChargingController.java
@@ -43,7 +43,7 @@
import android.util.Log;
import com.android.systemui.BootCompleteCache;
-import com.android.systemui.R;
+import com.android.systemui.res.R;
import com.android.systemui.broadcast.BroadcastDispatcher;
import com.android.systemui.dagger.SysUISingleton;
import com.android.systemui.statusbar.policy.BatteryController;
diff --git a/SystemUIGoogle/src/com/google/android/systemui/reversecharging/ReverseChargingViewController.java b/SystemUIGoogle/src/com/google/android/systemui/reversecharging/ReverseChargingViewController.java
index 1f41fa6..d911b67 100644
--- a/SystemUIGoogle/src/com/google/android/systemui/reversecharging/ReverseChargingViewController.java
+++ b/SystemUIGoogle/src/com/google/android/systemui/reversecharging/ReverseChargingViewController.java
@@ -29,7 +29,7 @@
import androidx.lifecycle.LifecycleRegistry;
import com.android.settingslib.Utils;
-import com.android.systemui.R;
+import com.android.systemui.res.R;
import com.android.systemui.broadcast.BroadcastDispatcher;
import com.android.systemui.dagger.SysUISingleton;
import com.android.systemui.statusbar.phone.CentralSurfaces;
diff --git a/SystemUIGoogle/src/com/google/android/systemui/reversecharging/dagger/ReverseChargingModule.java b/SystemUIGoogle/src/com/google/android/systemui/reversecharging/dagger/ReverseChargingModule.java
index e91a8f8..ad259a8 100644
--- a/SystemUIGoogle/src/com/google/android/systemui/reversecharging/dagger/ReverseChargingModule.java
+++ b/SystemUIGoogle/src/com/google/android/systemui/reversecharging/dagger/ReverseChargingModule.java
@@ -21,7 +21,7 @@
import android.os.IThermalService;
import android.os.ServiceManager;
-import com.android.systemui.R;
+import com.android.systemui.res.R;
import com.android.systemui.broadcast.BroadcastDispatcher;
import com.android.systemui.dagger.SysUISingleton;
import com.android.systemui.dagger.qualifiers.Main;
diff --git a/SystemUIGoogle/src/com/google/android/systemui/smartspace/BcSmartSpaceUtil.java b/SystemUIGoogle/src/com/google/android/systemui/smartspace/BcSmartSpaceUtil.java
index 0c072c0..cddf4b5 100644
--- a/SystemUIGoogle/src/com/google/android/systemui/smartspace/BcSmartSpaceUtil.java
+++ b/SystemUIGoogle/src/com/google/android/systemui/smartspace/BcSmartSpaceUtil.java
@@ -16,7 +16,7 @@
import android.provider.CalendarContract;
import android.util.Log;
import android.view.View;
-import com.android.systemui.R;
+import com.android.systemui.res.R;
import com.android.systemui.plugins.BcSmartspaceDataPlugin;
import com.android.systemui.plugins.FalsingManager;
import com.google.android.systemui.smartspace.logging.BcSmartspaceCardLogger;
diff --git a/SystemUIGoogle/src/com/google/android/systemui/smartspace/BcSmartspaceCard.java b/SystemUIGoogle/src/com/google/android/systemui/smartspace/BcSmartspaceCard.java
index 6090312..ef37a6e 100644
--- a/SystemUIGoogle/src/com/google/android/systemui/smartspace/BcSmartspaceCard.java
+++ b/SystemUIGoogle/src/com/google/android/systemui/smartspace/BcSmartspaceCard.java
@@ -13,7 +13,7 @@
import android.widget.TextView;
import androidx.constraintlayout.widget.ConstraintLayout;
import com.android.launcher3.icons.GraphicsUtils;
-import com.android.systemui.R;
+import com.android.systemui.res.R;
import com.android.app.animation.Interpolators;
import com.android.systemui.plugins.BcSmartspaceDataPlugin;
import com.google.android.systemui.smartspace.logging.BcSmartspaceCardLoggingInfo;
diff --git a/SystemUIGoogle/src/com/google/android/systemui/smartspace/BcSmartspaceCardCombination.java b/SystemUIGoogle/src/com/google/android/systemui/smartspace/BcSmartspaceCardCombination.java
index e39d52e..1a508dd 100644
--- a/SystemUIGoogle/src/com/google/android/systemui/smartspace/BcSmartspaceCardCombination.java
+++ b/SystemUIGoogle/src/com/google/android/systemui/smartspace/BcSmartspaceCardCombination.java
@@ -11,7 +11,7 @@
import android.widget.LinearLayout;
import android.widget.TextView;
import androidx.constraintlayout.widget.ConstraintLayout;
-import com.android.systemui.R;
+import com.android.systemui.res.R;
import com.android.systemui.plugins.BcSmartspaceDataPlugin;
import com.google.android.systemui.smartspace.logging.BcSmartspaceCardLoggingInfo;
import java.util.List;
diff --git a/SystemUIGoogle/src/com/google/android/systemui/smartspace/BcSmartspaceCardCombinationAtStore.java b/SystemUIGoogle/src/com/google/android/systemui/smartspace/BcSmartspaceCardCombinationAtStore.java
index ce92ee8..889309f 100644
--- a/SystemUIGoogle/src/com/google/android/systemui/smartspace/BcSmartspaceCardCombinationAtStore.java
+++ b/SystemUIGoogle/src/com/google/android/systemui/smartspace/BcSmartspaceCardCombinationAtStore.java
@@ -5,7 +5,7 @@
import android.content.Context;
import android.util.AttributeSet;
import androidx.constraintlayout.widget.ConstraintLayout;
-import com.android.systemui.R;
+import com.android.systemui.res.R;
import com.android.systemui.plugins.BcSmartspaceDataPlugin;
import com.google.android.systemui.smartspace.logging.BcSmartspaceCardLoggingInfo;
import java.util.List;
diff --git a/SystemUIGoogle/src/com/google/android/systemui/smartspace/BcSmartspaceCardDoorbell.java b/SystemUIGoogle/src/com/google/android/systemui/smartspace/BcSmartspaceCardDoorbell.java
index 1155a22..3bc2d42 100644
--- a/SystemUIGoogle/src/com/google/android/systemui/smartspace/BcSmartspaceCardDoorbell.java
+++ b/SystemUIGoogle/src/com/google/android/systemui/smartspace/BcSmartspaceCardDoorbell.java
@@ -25,7 +25,7 @@
import androidx.core.graphics.drawable.RoundedBitmapDrawable;
import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory;
import com.android.launcher3.icons.RoundDrawableWrapper;
-import com.android.systemui.R;
+import com.android.systemui.res.R;
import com.android.systemui.plugins.BcSmartspaceDataPlugin;
import com.google.android.systemui.smartspace.logging.BcSmartspaceCardLoggingInfo;
import java.io.IOException;
diff --git a/SystemUIGoogle/src/com/google/android/systemui/smartspace/BcSmartspaceCardFlight.java b/SystemUIGoogle/src/com/google/android/systemui/smartspace/BcSmartspaceCardFlight.java
index 36b314d..fed9eb8 100644
--- a/SystemUIGoogle/src/com/google/android/systemui/smartspace/BcSmartspaceCardFlight.java
+++ b/SystemUIGoogle/src/com/google/android/systemui/smartspace/BcSmartspaceCardFlight.java
@@ -8,7 +8,7 @@
import android.util.AttributeSet;
import android.util.Log;
import android.widget.ImageView;
-import com.android.systemui.R;
+import com.android.systemui.res.R;
import com.android.systemui.plugins.BcSmartspaceDataPlugin;
import com.google.android.systemui.smartspace.logging.BcSmartspaceCardLoggingInfo;
diff --git a/SystemUIGoogle/src/com/google/android/systemui/smartspace/BcSmartspaceCardGenericImage.java b/SystemUIGoogle/src/com/google/android/systemui/smartspace/BcSmartspaceCardGenericImage.java
index bf546f7..6a916b3 100644
--- a/SystemUIGoogle/src/com/google/android/systemui/smartspace/BcSmartspaceCardGenericImage.java
+++ b/SystemUIGoogle/src/com/google/android/systemui/smartspace/BcSmartspaceCardGenericImage.java
@@ -10,7 +10,7 @@
import android.view.ViewGroup;
import android.widget.ImageView;
import androidx.constraintlayout.widget.ConstraintLayout;
-import com.android.systemui.R;
+import com.android.systemui.res.R;
import com.android.systemui.plugins.BcSmartspaceDataPlugin;
import com.google.android.systemui.smartspace.logging.BcSmartspaceCardLoggingInfo;
diff --git a/SystemUIGoogle/src/com/google/android/systemui/smartspace/BcSmartspaceCardLoyalty.java b/SystemUIGoogle/src/com/google/android/systemui/smartspace/BcSmartspaceCardLoyalty.java
index 7a8373b..c947267 100644
--- a/SystemUIGoogle/src/com/google/android/systemui/smartspace/BcSmartspaceCardLoyalty.java
+++ b/SystemUIGoogle/src/com/google/android/systemui/smartspace/BcSmartspaceCardLoyalty.java
@@ -9,7 +9,7 @@
import android.util.Log;
import android.widget.ImageView;
import android.widget.TextView;
-import com.android.systemui.R;
+import com.android.systemui.res.R;
import com.android.systemui.plugins.BcSmartspaceDataPlugin;
import com.google.android.systemui.smartspace.logging.BcSmartspaceCardLoggingInfo;
diff --git a/SystemUIGoogle/src/com/google/android/systemui/smartspace/BcSmartspaceCardShoppingList.java b/SystemUIGoogle/src/com/google/android/systemui/smartspace/BcSmartspaceCardShoppingList.java
index 534e83a..2711699 100644
--- a/SystemUIGoogle/src/com/google/android/systemui/smartspace/BcSmartspaceCardShoppingList.java
+++ b/SystemUIGoogle/src/com/google/android/systemui/smartspace/BcSmartspaceCardShoppingList.java
@@ -9,7 +9,7 @@
import android.util.Log;
import android.widget.ImageView;
import android.widget.TextView;
-import com.android.systemui.R;
+import com.android.systemui.res.R;
import com.android.systemui.plugins.BcSmartspaceDataPlugin;
import com.google.android.systemui.smartspace.logging.BcSmartspaceCardLoggingInfo;
import java.util.Locale;
diff --git a/SystemUIGoogle/src/com/google/android/systemui/smartspace/BcSmartspaceCardSports.java b/SystemUIGoogle/src/com/google/android/systemui/smartspace/BcSmartspaceCardSports.java
index a4f3495..450752a 100644
--- a/SystemUIGoogle/src/com/google/android/systemui/smartspace/BcSmartspaceCardSports.java
+++ b/SystemUIGoogle/src/com/google/android/systemui/smartspace/BcSmartspaceCardSports.java
@@ -9,7 +9,7 @@
import android.util.Log;
import android.widget.ImageView;
import android.widget.TextView;
-import com.android.systemui.R;
+import com.android.systemui.res.R;
import com.android.systemui.plugins.BcSmartspaceDataPlugin;
import com.google.android.systemui.smartspace.logging.BcSmartspaceCardLoggingInfo;
diff --git a/SystemUIGoogle/src/com/google/android/systemui/smartspace/BcSmartspaceCardWeatherForecast.java b/SystemUIGoogle/src/com/google/android/systemui/smartspace/BcSmartspaceCardWeatherForecast.java
index 976b7e5..f952ca0 100644
--- a/SystemUIGoogle/src/com/google/android/systemui/smartspace/BcSmartspaceCardWeatherForecast.java
+++ b/SystemUIGoogle/src/com/google/android/systemui/smartspace/BcSmartspaceCardWeatherForecast.java
@@ -15,7 +15,7 @@
import android.widget.TextView;
import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.constraintlayout.widget.Constraints;
-import com.android.systemui.R;
+import com.android.systemui.res.R;
import com.android.systemui.plugins.BcSmartspaceDataPlugin;
import com.google.android.systemui.smartspace.logging.BcSmartspaceCardLoggingInfo;
diff --git a/SystemUIGoogle/src/com/google/android/systemui/smartspace/BcSmartspaceDataProvider.java b/SystemUIGoogle/src/com/google/android/systemui/smartspace/BcSmartspaceDataProvider.java
index 7a9511a..4cae40f 100644
--- a/SystemUIGoogle/src/com/google/android/systemui/smartspace/BcSmartspaceDataProvider.java
+++ b/SystemUIGoogle/src/com/google/android/systemui/smartspace/BcSmartspaceDataProvider.java
@@ -23,7 +23,7 @@
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
-import com.android.systemui.R;
+import com.android.systemui.res.R;
import com.android.systemui.plugins.BcSmartspaceDataPlugin;
import java.util.ArrayList;
import java.util.HashSet;
diff --git a/SystemUIGoogle/src/com/google/android/systemui/smartspace/BcSmartspaceTemplateDataUtils.java b/SystemUIGoogle/src/com/google/android/systemui/smartspace/BcSmartspaceTemplateDataUtils.java
index 9e87ae4..9c7c40a 100644
--- a/SystemUIGoogle/src/com/google/android/systemui/smartspace/BcSmartspaceTemplateDataUtils.java
+++ b/SystemUIGoogle/src/com/google/android/systemui/smartspace/BcSmartspaceTemplateDataUtils.java
@@ -7,7 +7,7 @@
import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
-import com.android.systemui.R;
+import com.android.systemui.res.R;
public final class BcSmartspaceTemplateDataUtils {
public static int getSecondaryCardRes(int i) {
diff --git a/SystemUIGoogle/src/com/google/android/systemui/smartspace/BcSmartspaceView.java b/SystemUIGoogle/src/com/google/android/systemui/smartspace/BcSmartspaceView.java
index 90a490b..3d69ef4 100644
--- a/SystemUIGoogle/src/com/google/android/systemui/smartspace/BcSmartspaceView.java
+++ b/SystemUIGoogle/src/com/google/android/systemui/smartspace/BcSmartspaceView.java
@@ -24,7 +24,7 @@
import android.widget.FrameLayout;
import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.viewpager.widget.ViewPager;
-import com.android.systemui.R;
+import com.android.systemui.res.R;
import com.android.systemui.plugins.BcSmartspaceDataPlugin;
import com.android.systemui.plugins.FalsingManager;
import com.google.android.systemui.smartspace.CardPagerAdapter;
diff --git a/SystemUIGoogle/src/com/google/android/systemui/smartspace/CardPagerAdapter.java b/SystemUIGoogle/src/com/google/android/systemui/smartspace/CardPagerAdapter.java
index bb26d7a..6cde3bf 100644
--- a/SystemUIGoogle/src/com/google/android/systemui/smartspace/CardPagerAdapter.java
+++ b/SystemUIGoogle/src/com/google/android/systemui/smartspace/CardPagerAdapter.java
@@ -19,7 +19,7 @@
import androidx.viewpager.widget.PagerAdapter;
import com.android.internal.graphics.ColorUtils;
import com.android.launcher3.icons.GraphicsUtils;
-import com.android.systemui.R;
+import com.android.systemui.res.R;
import com.android.systemui.plugins.BcSmartspaceDataPlugin;
import com.google.android.systemui.smartspace.logging.BcSmartspaceCardLoggerUtil;
import com.google.android.systemui.smartspace.logging.BcSmartspaceCardLoggingInfo;
diff --git a/SystemUIGoogle/src/com/google/android/systemui/smartspace/DoubleShadowIconDrawable.java b/SystemUIGoogle/src/com/google/android/systemui/smartspace/DoubleShadowIconDrawable.java
index 1db47d8..d04412d 100644
--- a/SystemUIGoogle/src/com/google/android/systemui/smartspace/DoubleShadowIconDrawable.java
+++ b/SystemUIGoogle/src/com/google/android/systemui/smartspace/DoubleShadowIconDrawable.java
@@ -13,7 +13,7 @@
import android.graphics.drawable.Drawable;
import android.graphics.drawable.InsetDrawable;
import com.android.internal.graphics.ColorUtils;
-import com.android.systemui.R;
+import com.android.systemui.res.R;
public class DoubleShadowIconDrawable extends Drawable {
public int mAmbientShadowRadius;
diff --git a/SystemUIGoogle/src/com/google/android/systemui/smartspace/DoubleShadowTextView.java b/SystemUIGoogle/src/com/google/android/systemui/smartspace/DoubleShadowTextView.java
index 9a485a5..c997dea 100644
--- a/SystemUIGoogle/src/com/google/android/systemui/smartspace/DoubleShadowTextView.java
+++ b/SystemUIGoogle/src/com/google/android/systemui/smartspace/DoubleShadowTextView.java
@@ -5,7 +5,7 @@
import android.util.AttributeSet;
import android.widget.TextView;
import androidx.core.graphics.ColorUtils;
-import com.android.systemui.R;
+import com.android.systemui.res.R;
public class DoubleShadowTextView extends TextView {
public final float mAmbientShadowBlur;
diff --git a/SystemUIGoogle/src/com/google/android/systemui/smartspace/IcuDateTextView.java b/SystemUIGoogle/src/com/google/android/systemui/smartspace/IcuDateTextView.java
index af695cd..f8db1cb 100644
--- a/SystemUIGoogle/src/com/google/android/systemui/smartspace/IcuDateTextView.java
+++ b/SystemUIGoogle/src/com/google/android/systemui/smartspace/IcuDateTextView.java
@@ -9,7 +9,7 @@
import android.os.Handler;
import android.os.SystemClock;
import android.util.AttributeSet;
-import com.android.systemui.R;
+import com.android.systemui.res.R;
import java.util.Locale;
import java.util.Objects;
diff --git a/SystemUIGoogle/src/com/google/android/systemui/smartspace/KeyguardMediaViewController.java b/SystemUIGoogle/src/com/google/android/systemui/smartspace/KeyguardMediaViewController.java
index cb699c7..c8ea17a 100644
--- a/SystemUIGoogle/src/com/google/android/systemui/smartspace/KeyguardMediaViewController.java
+++ b/SystemUIGoogle/src/com/google/android/systemui/smartspace/KeyguardMediaViewController.java
@@ -14,7 +14,7 @@
import android.text.TextUtils;
import android.view.View;
-import com.android.systemui.R;
+import com.android.systemui.res.R;
import com.android.systemui.broadcast.BroadcastDispatcher;
import com.android.systemui.dagger.SysUISingleton;
import com.android.systemui.dagger.qualifiers.Main;
diff --git a/SystemUIGoogle/src/com/google/android/systemui/smartspace/KeyguardZenAlarmViewController.kt b/SystemUIGoogle/src/com/google/android/systemui/smartspace/KeyguardZenAlarmViewController.kt
index 04b2abd..609bb02 100644
--- a/SystemUIGoogle/src/com/google/android/systemui/smartspace/KeyguardZenAlarmViewController.kt
+++ b/SystemUIGoogle/src/com/google/android/systemui/smartspace/KeyguardZenAlarmViewController.kt
@@ -9,7 +9,7 @@
import android.text.format.DateFormat
import android.view.View
import com.android.internal.annotations.VisibleForTesting
-import com.android.systemui.R
+import com.android.systemui.res.R
import com.android.systemui.dagger.SysUISingleton
import com.android.systemui.plugins.BcSmartspaceDataPlugin
import com.android.systemui.statusbar.policy.NextAlarmController
@@ -45,7 +45,7 @@
fun init() {
plugin.addOnAttachStateChangeListener(object : View.OnAttachStateChangeListener {
- override fun onViewAttachedToWindow(v: View?) {
+ override fun onViewAttachedToWindow(v: View) {
smartspaceViews.add(v as BcSmartspaceDataPlugin.SmartspaceView)
if (smartspaceViews.size == 1) {
zenModeController.addCallback(zenModeCallback)
@@ -54,7 +54,7 @@
refresh()
}
- override fun onViewDetachedFromWindow(v: View?) {
+ override fun onViewDetachedFromWindow(v: View) {
smartspaceViews.remove(v as BcSmartspaceDataPlugin.SmartspaceView)
if (smartspaceViews.isEmpty()) {
zenModeController.removeCallback(zenModeCallback)
@@ -72,12 +72,11 @@
private fun loadDndImage(): Drawable {
val drawable: Drawable = context.getResources().getDrawable(R.drawable.stat_sys_dnd, null)
- val drawable2: Drawable = (drawable as InsetDrawable).getDrawable()
- return drawable2
+ return drawable
}
fun updateDnd() {
- if (zenModeController.getZen() != 0) {
+ if (zenModeController.getZen() !== 0) {
val string: String =
context.getResources().getString(R.string.accessibility_quick_settings_dnd)
for (smartspaceView in smartspaceViews) {
diff --git a/SystemUIGoogle/src/com/google/android/systemui/smartspace/PageIndicator.java b/SystemUIGoogle/src/com/google/android/systemui/smartspace/PageIndicator.java
index 90361c9..6c29c07 100644
--- a/SystemUIGoogle/src/com/google/android/systemui/smartspace/PageIndicator.java
+++ b/SystemUIGoogle/src/com/google/android/systemui/smartspace/PageIndicator.java
@@ -8,7 +8,7 @@
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.LinearLayout;
-import com.android.systemui.R;
+import com.android.systemui.res.R;
public class PageIndicator extends LinearLayout {
public int mCurrentPageIndex;
diff --git a/SystemUIGoogle/src/com/google/android/systemui/smartspace/SmartSpaceCard.java b/SystemUIGoogle/src/com/google/android/systemui/smartspace/SmartSpaceCard.java
index 0546d78..7385011 100644
--- a/SystemUIGoogle/src/com/google/android/systemui/smartspace/SmartSpaceCard.java
+++ b/SystemUIGoogle/src/com/google/android/systemui/smartspace/SmartSpaceCard.java
@@ -24,7 +24,7 @@
import android.text.TextUtils;
import android.util.Log;
import androidx.annotation.NonNull;
-import com.android.systemui.R;
+import com.android.systemui.res.R;
import com.android.systemui.smartspace.nano.SmartspaceProto;
public final class SmartSpaceCard {
diff --git a/SystemUIGoogle/src/com/google/android/systemui/smartspace/dagger/SmartspaceGoogleModule.kt b/SystemUIGoogle/src/com/google/android/systemui/smartspace/dagger/SmartspaceGoogleModule.kt
index 99b2ff8..6301915 100644
--- a/SystemUIGoogle/src/com/google/android/systemui/smartspace/dagger/SmartspaceGoogleModule.kt
+++ b/SystemUIGoogle/src/com/google/android/systemui/smartspace/dagger/SmartspaceGoogleModule.kt
@@ -21,7 +21,6 @@
import com.android.systemui.smartspace.dagger.SmartspaceModule.Companion.DREAM_SMARTSPACE_DATA_PLUGIN
import com.android.systemui.smartspace.dagger.SmartspaceModule.Companion.DREAM_SMARTSPACE_TARGET_FILTER
import com.google.android.systemui.smartspace.*
-import com.google.android.systemui.smartspace.filters.DreamTargetFilter
import dagger.Binds
import dagger.Module
import javax.inject.Named
@@ -33,10 +32,4 @@
abstract fun bindsDreamBcSmartspaceDataPlugin(
plugin: BcSmartspaceDataProvider
): BcSmartspaceDataPlugin
-
- @Binds
- @Named(DREAM_SMARTSPACE_TARGET_FILTER)
- abstract fun bindsDreamSmartspaceTargetFilter(
- filter: DreamTargetFilter
- ): SmartspaceTargetFilter
}
diff --git a/SystemUIGoogle/src/com/google/android/systemui/smartspace/uitemplate/BaseTemplateCard.java b/SystemUIGoogle/src/com/google/android/systemui/smartspace/uitemplate/BaseTemplateCard.java
index da7f3b0..4488894 100644
--- a/SystemUIGoogle/src/com/google/android/systemui/smartspace/uitemplate/BaseTemplateCard.java
+++ b/SystemUIGoogle/src/com/google/android/systemui/smartspace/uitemplate/BaseTemplateCard.java
@@ -17,7 +17,7 @@
import android.widget.ImageView;
import androidx.constraintlayout.widget.ConstraintLayout;
import com.android.launcher3.icons.GraphicsUtils;
-import com.android.systemui.R;
+import com.android.systemui.res.R;
import com.android.app.animation.Interpolators;
import com.android.systemui.plugins.BcSmartspaceDataPlugin;
import com.google.android.systemui.smartspace.BcSmartSpaceUtil;
diff --git a/SystemUIGoogle/src/com/google/android/systemui/smartspace/uitemplate/CarouselTemplateCard.java b/SystemUIGoogle/src/com/google/android/systemui/smartspace/uitemplate/CarouselTemplateCard.java
index f67f1ee..1bce457 100644
--- a/SystemUIGoogle/src/com/google/android/systemui/smartspace/uitemplate/CarouselTemplateCard.java
+++ b/SystemUIGoogle/src/com/google/android/systemui/smartspace/uitemplate/CarouselTemplateCard.java
@@ -11,7 +11,7 @@
import android.widget.TextView;
import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.constraintlayout.widget.Constraints;
-import com.android.systemui.R;
+import com.android.systemui.res.R;
import com.android.systemui.plugins.BcSmartspaceDataPlugin;
import com.google.android.systemui.smartspace.BcSmartSpaceUtil;
import com.google.android.systemui.smartspace.BcSmartspaceCardSecondary;
diff --git a/SystemUIGoogle/src/com/google/android/systemui/smartspace/uitemplate/CombinedCardsTemplateCard.java b/SystemUIGoogle/src/com/google/android/systemui/smartspace/uitemplate/CombinedCardsTemplateCard.java
index 145a175..8a95e9f 100644
--- a/SystemUIGoogle/src/com/google/android/systemui/smartspace/uitemplate/CombinedCardsTemplateCard.java
+++ b/SystemUIGoogle/src/com/google/android/systemui/smartspace/uitemplate/CombinedCardsTemplateCard.java
@@ -9,7 +9,7 @@
import android.view.LayoutInflater;
import android.view.ViewGroup;
import androidx.constraintlayout.widget.ConstraintLayout;
-import com.android.systemui.R;
+import com.android.systemui.res.R;
import com.android.systemui.plugins.BcSmartspaceDataPlugin;
import com.google.android.systemui.smartspace.BcSmartspaceCardSecondary;
import com.google.android.systemui.smartspace.BcSmartspaceTemplateDataUtils;
diff --git a/SystemUIGoogle/src/com/google/android/systemui/smartspace/uitemplate/HeadToHeadTemplateCard.java b/SystemUIGoogle/src/com/google/android/systemui/smartspace/uitemplate/HeadToHeadTemplateCard.java
index 1f5b642..46bc08b 100644
--- a/SystemUIGoogle/src/com/google/android/systemui/smartspace/uitemplate/HeadToHeadTemplateCard.java
+++ b/SystemUIGoogle/src/com/google/android/systemui/smartspace/uitemplate/HeadToHeadTemplateCard.java
@@ -9,7 +9,7 @@
import android.util.Log;
import android.widget.ImageView;
import android.widget.TextView;
-import com.android.systemui.R;
+import com.android.systemui.res.R;
import com.android.systemui.plugins.BcSmartspaceDataPlugin;
import com.google.android.systemui.smartspace.BcSmartSpaceUtil;
import com.google.android.systemui.smartspace.BcSmartspaceCardSecondary;
diff --git a/SystemUIGoogle/src/com/google/android/systemui/smartspace/uitemplate/SubCardTemplateCard.java b/SystemUIGoogle/src/com/google/android/systemui/smartspace/uitemplate/SubCardTemplateCard.java
index 3f5aaf9..367c71c 100644
--- a/SystemUIGoogle/src/com/google/android/systemui/smartspace/uitemplate/SubCardTemplateCard.java
+++ b/SystemUIGoogle/src/com/google/android/systemui/smartspace/uitemplate/SubCardTemplateCard.java
@@ -8,7 +8,7 @@
import android.util.Log;
import android.widget.ImageView;
import android.widget.TextView;
-import com.android.systemui.R;
+import com.android.systemui.res.R;
import com.android.systemui.plugins.BcSmartspaceDataPlugin;
import com.google.android.systemui.smartspace.BcSmartSpaceUtil;
import com.google.android.systemui.smartspace.BcSmartspaceCardSecondary;
diff --git a/SystemUIGoogle/src/com/google/android/systemui/smartspace/uitemplate/SubImageTemplateCard.java b/SystemUIGoogle/src/com/google/android/systemui/smartspace/uitemplate/SubImageTemplateCard.java
index 0b99f49..450311e 100644
--- a/SystemUIGoogle/src/com/google/android/systemui/smartspace/uitemplate/SubImageTemplateCard.java
+++ b/SystemUIGoogle/src/com/google/android/systemui/smartspace/uitemplate/SubImageTemplateCard.java
@@ -21,7 +21,7 @@
import android.util.Size;
import android.widget.ImageView;
import androidx.constraintlayout.widget.ConstraintLayout;
-import com.android.systemui.R;
+import com.android.systemui.res.R;
import com.android.systemui.plugins.BcSmartspaceDataPlugin;
import com.google.android.systemui.smartspace.BcSmartSpaceUtil;
import com.google.android.systemui.smartspace.BcSmartspaceCardSecondary;
diff --git a/SystemUIGoogle/src/com/google/android/systemui/smartspace/uitemplate/SubListTemplateCard.java b/SystemUIGoogle/src/com/google/android/systemui/smartspace/uitemplate/SubListTemplateCard.java
index 7a2fb0e..9bebab8 100644
--- a/SystemUIGoogle/src/com/google/android/systemui/smartspace/uitemplate/SubListTemplateCard.java
+++ b/SystemUIGoogle/src/com/google/android/systemui/smartspace/uitemplate/SubListTemplateCard.java
@@ -8,7 +8,7 @@
import android.util.Log;
import android.widget.ImageView;
import android.widget.TextView;
-import com.android.systemui.R;
+import com.android.systemui.res.R;
import com.android.systemui.plugins.BcSmartspaceDataPlugin;
import com.google.android.systemui.smartspace.BcSmartSpaceUtil;
import com.google.android.systemui.smartspace.BcSmartspaceCardSecondary;
diff --git a/SystemUIGoogle/src/com/google/android/systemui/statusbar/KeyguardIndicationControllerGoogle.java b/SystemUIGoogle/src/com/google/android/systemui/statusbar/KeyguardIndicationControllerGoogle.java
index 7984db2..0a03f1c 100644
--- a/SystemUIGoogle/src/com/google/android/systemui/statusbar/KeyguardIndicationControllerGoogle.java
+++ b/SystemUIGoogle/src/com/google/android/systemui/statusbar/KeyguardIndicationControllerGoogle.java
@@ -39,7 +39,7 @@
import com.android.keyguard.KeyguardUpdateMonitorCallback;
import com.android.keyguard.logging.KeyguardLogger;
import com.android.settingslib.fuelgauge.BatteryStatus;
-import com.android.systemui.R;
+import com.android.systemui.res.R;
import com.android.systemui.biometrics.AuthController;
import com.android.systemui.biometrics.FaceHelpMessageDeferral;
import com.android.systemui.broadcast.BroadcastDispatcher;
diff --git a/SystemUIGoogle/src/com/google/android/systemui/statusbar/phone/CentralSurfacesGoogle.java b/SystemUIGoogle/src/com/google/android/systemui/statusbar/phone/CentralSurfacesGoogle.java
index c827677..d562561 100644
--- a/SystemUIGoogle/src/com/google/android/systemui/statusbar/phone/CentralSurfacesGoogle.java
+++ b/SystemUIGoogle/src/com/google/android/systemui/statusbar/phone/CentralSurfacesGoogle.java
@@ -38,7 +38,7 @@
import com.android.keyguard.ViewMediatorCallback;
import com.android.systemui.Dependency;
import com.android.systemui.InitController;
-import com.android.systemui.R;
+import com.android.systemui.res.R;
import com.android.systemui.accessibility.floatingmenu.AccessibilityFloatingMenuController;
import com.android.systemui.animation.ActivityLaunchAnimator;
import com.android.systemui.assist.AssistManager;
@@ -71,6 +71,8 @@
import com.android.systemui.power.domain.interactor.PowerInteractor;
import com.android.systemui.settings.UserTracker;
import com.android.systemui.recents.ScreenPinningRequest;
+import com.android.systemui.scene.domain.interactor.WindowRootViewVisibilityInteractor;
+import com.android.systemui.scene.shared.flag.SceneContainerFlags;
import com.android.systemui.settings.brightness.BrightnessSliderController;
import com.android.systemui.shade.CameraLauncher;
import com.android.systemui.shade.NotificationShadeWindowView;
@@ -81,6 +83,7 @@
import com.android.systemui.shade.ShadeSurface;
import com.android.systemui.shade.QuickSettingsController;
import com.android.systemui.statusbar.core.StatusBarInitializer;
+import com.android.systemui.statusbar.data.repository.StatusBarModeRepositoryStore;
import com.android.systemui.statusbar.CommandQueue;
import com.android.systemui.statusbar.KeyguardIndicationController;
import com.android.systemui.statusbar.LightRevealScrim;
@@ -91,14 +94,15 @@
import com.android.systemui.statusbar.NotificationRemoteInputManager;
import com.android.systemui.statusbar.NotificationShadeDepthController;
import com.android.systemui.statusbar.NotificationShadeWindowController;
-import com.android.systemui.statusbar.NotificationShelfController;
import com.android.systemui.statusbar.PulseExpansionHandler;
import com.android.systemui.statusbar.SysuiStatusBarStateController;
-import com.android.systemui.statusbar.notification.data.repository.NotificationExpansionRepository;
import com.android.systemui.statusbar.notification.DynamicPrivacyController;
+import com.android.systemui.statusbar.notification.NotificationActivityStarter;
+import com.android.systemui.statusbar.notification.NotificationLaunchAnimatorControllerProvider;
import com.android.systemui.statusbar.notification.NotificationWakeUpCoordinator;
import com.android.systemui.statusbar.notification.init.NotificationsController;
import com.android.systemui.statusbar.notification.interruption.NotificationInterruptStateProvider;
+import com.android.systemui.statusbar.notification.interruption.VisualInterruptionDecisionProvider;
import com.android.systemui.statusbar.notification.logging.NotificationLogger;
import com.android.systemui.statusbar.notification.row.NotificationGutsManager;
import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayoutController;
@@ -108,29 +112,28 @@
import com.android.systemui.statusbar.phone.DozeParameters;
import com.android.systemui.statusbar.phone.DozeScrimController;
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.LightBarController;
-import com.android.systemui.statusbar.phone.LockscreenWallpaper;
import com.android.systemui.statusbar.phone.NotificationIconAreaController;
import com.android.systemui.statusbar.phone.PhoneStatusBarPolicy;
import com.android.systemui.statusbar.phone.StatusBarHideIconsForBouncerManager;
import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;
import com.android.systemui.statusbar.phone.StatusBarSignalPolicy;
import com.android.systemui.statusbar.phone.StatusBarTouchableRegionManager;
-import com.android.systemui.statusbar.phone.dagger.CentralSurfacesComponent;
import com.android.systemui.statusbar.phone.ongoingcall.OngoingCallController;
import com.android.systemui.statusbar.policy.BatteryController;
import com.android.systemui.statusbar.policy.BurnInProtectionController;
import com.android.systemui.statusbar.policy.ConfigurationController;
import com.android.systemui.statusbar.policy.DeviceProvisionedController;
import com.android.systemui.statusbar.policy.ExtensionController;
+import com.android.systemui.statusbar.policy.HeadsUpManager;
import com.android.systemui.statusbar.policy.KeyguardStateController;
import com.android.systemui.statusbar.policy.UserInfoControllerImpl;
import com.android.systemui.statusbar.policy.UserSwitcherController;
import com.android.systemui.statusbar.window.StatusBarWindowController;
import com.android.systemui.statusbar.window.StatusBarWindowStateController;
import com.android.systemui.tuner.TunerService;
+import com.android.systemui.util.kotlin.JavaAdapter;
import com.android.systemui.util.WallpaperController;
import com.android.systemui.util.concurrency.DelayableExecutor;
import com.android.systemui.util.concurrency.MessageRouter;
@@ -138,8 +141,6 @@
import com.android.wm.shell.bubbles.Bubbles;
import com.android.wm.shell.startingsurface.StartingSurface;
import com.google.android.systemui.NotificationLockscreenUserManagerGoogle;
-import com.google.android.systemui.dreamliner.DockIndicationController;
-import com.google.android.systemui.dreamliner.DockObserver;
import com.google.android.systemui.reversecharging.ReverseChargingViewController;
import com.google.android.systemui.smartspace.SmartSpaceController;
import com.google.android.systemui.statusbar.KeyguardIndicationControllerGoogle;
@@ -182,25 +183,26 @@
StatusBarInitializer statusBarInitializer,
StatusBarWindowController statusBarWindowController,
StatusBarWindowStateController statusBarWindowStateController,
+ StatusBarModeRepositoryStore statusBarModeRepository,
KeyguardUpdateMonitor keyguardUpdateMonitor,
StatusBarSignalPolicy statusBarSignalPolicy,
PulseExpansionHandler pulseExpansionHandler,
NotificationWakeUpCoordinator notificationWakeUpCoordinator,
KeyguardBypassController keyguardBypassController,
KeyguardStateController keyguardStateController,
- HeadsUpManagerPhone headsUpManagerPhone,
+ HeadsUpManager headsUpManager,
DynamicPrivacyController dynamicPrivacyController,
FalsingManager falsingManager,
FalsingCollector falsingCollector,
BroadcastDispatcher broadcastDispatcher,
NotificationGutsManager notificationGutsManager,
- NotificationLogger notificationLogger,
- NotificationInterruptStateProvider notificationInterruptStateProvider,
+ VisualInterruptionDecisionProvider visualInterruptionDecisionProvider,
ShadeExpansionStateManager shadeExpansionStateManager,
KeyguardViewMediator keyguardViewMediator,
DisplayMetrics displayMetrics,
MetricsLogger metricsLogger,
ShadeLogger shadeLogger,
+ JavaAdapter javaAdapter,
@UiBackground Executor uiBgExecutor,
ShadeSurface shadeSurface,
NotificationMediaManager notificationMediaManager,
@@ -223,26 +225,25 @@
ConfigurationController configurationController,
NotificationShadeWindowController notificationShadeWindowController,
Lazy<NotificationShadeWindowViewController> notificationShadeWindowViewControllerLazy,
- NotificationShelfController notificationShelfController,
NotificationStackScrollLayoutController notificationStackScrollLayoutController,
- // Lazy due to b/298099682.
+ // Lazys due to b/298099682.
Lazy<NotificationPresenter> notificationPresenterLazy,
- NotificationExpansionRepository notificationExpansionRepository,
+ Lazy<NotificationActivityStarter> notificationActivityStarterLazy,
+ NotificationLaunchAnimatorControllerProvider notifLaunchAnimatorControllerProvider,
DozeParameters dozeParameters,
ScrimController scrimController,
- Lazy<LockscreenWallpaper> lockscreenWallpaperLazy,
Lazy<BiometricUnlockController> biometricUnlockControllerLazy,
AuthRippleController authRippleController,
DozeServiceHost dozeServiceHost,
BackActionInteractor backActionInteractor,
PowerManager powerManager,
- ScreenPinningRequest screenPinningRequest,
DozeScrimController dozeScrimController,
VolumeComponent volumeComponent,
CommandQueue commandQueue,
- CentralSurfacesComponent.Factory centralSurfacesComponentFactory,
+ Lazy<CentralSurfacesCommandQueueCallbacks> commandQueueCallbacksLazy,
PluginManager pluginManager,
ShadeController shadeController,
+ WindowRootViewVisibilityInteractor windowRootViewVisibilityInteractor,
StatusBarKeyguardViewManager statusBarKeyguardViewManager,
ViewMediatorCallback viewMediatorCallback,
InitController initController,
@@ -251,6 +252,7 @@
ExtensionController extensionController,
UserInfoControllerImpl userInfoControllerImpl,
PhoneStatusBarPolicy phoneStatusBarPolicy,
+ KeyguardIndicationControllerGoogle keyguardIndicationControllerGoogle,
DemoModeController demoModeController,
Lazy<NotificationShadeDepthController> notificationShadeDepthControllerLazy,
StatusBarTouchableRegionManager statusBarTouchableRegionManager,
@@ -258,7 +260,6 @@
BrightnessSliderController.Factory brightnessSliderFactory,
ScreenOffAnimationController screenOffAnimationController,
WallpaperController wallpaperController,
- OngoingCallController ongoingCallController,
StatusBarHideIconsForBouncerManager statusBarHideIconsForBouncerManager,
LockscreenShadeTransitionController lockscreenShadeTransitionController,
FeatureFlags featureFlags,
@@ -280,44 +281,32 @@
Provider<FingerprintManager> fingerprintManager,
TunerService tunerService,
ActivityStarter activityStarter,
+ SceneContainerFlags sceneContainerFlags,
SysUiState sysUiState,
BurnInProtectionController burnInProtectionController,
- WallpaperNotifier wallpaperNotifier,
- SmartSpaceController smartSpaceController,
Optional<ReverseChargingViewController> reverseChargingViewControllerOptional,
- KeyguardIndicationControllerGoogle keyguardIndicationControllerGoogle) {
- super(context, notificationsController, fragmentService, lightBarController,
- autoHideController, statusBarInitializer, statusBarWindowController, statusBarWindowStateController,
- keyguardUpdateMonitor, statusBarSignalPolicy, pulseExpansionHandler,
- notificationWakeUpCoordinator, keyguardBypassController, keyguardStateController,
- headsUpManagerPhone, dynamicPrivacyController, falsingManager, falsingCollector,
- broadcastDispatcher, notificationGutsManager, notificationLogger, notificationInterruptStateProvider,
- shadeExpansionStateManager, keyguardViewMediator,
- displayMetrics, metricsLogger, shadeLogger, uiBgExecutor, shadeSurface, notificationMediaManager,
- notificationLockscreenUserManagerGoogle, remoteInputManager, quickSettingsController,
- userSwitcherController, batteryController, colorExtractor, screenLifecycle,
- wakefulnessLifecycle, powerInteractor, statusBarStateController,
- bubblesOptional, noteTaskControllerLazy, deviceProvisionedController,
- navigationBarController, accessibilityFloatingMenuController, assistManagerLazy,
- configurationController, notificationShadeWindowController, notificationShadeWindowViewControllerLazy,
- notificationShelfController, notificationStackScrollLayoutController, notificationPresenterLazy,
- notificationExpansionRepository, dozeParameters, scrimController, lockscreenWallpaperLazy,
- biometricUnlockControllerLazy, authRippleController, dozeServiceHost, backActionInteractor,
- powerManager, screenPinningRequest,
- dozeScrimController, volumeComponent, commandQueue, centralSurfacesComponentFactory,
- pluginManager, shadeController, statusBarKeyguardViewManager, viewMediatorCallback,
- initController, timeTickHandler, pluginDependencyProvider,
- extensionController, userInfoControllerImpl, phoneStatusBarPolicy,
- keyguardIndicationControllerGoogle, demoModeController,
- notificationShadeDepthControllerLazy, statusBarTouchableRegionManager,
- notificationIconAreaController, brightnessSliderFactory,
- screenOffAnimationController, wallpaperController, ongoingCallController,
- statusBarHideIconsForBouncerManager, lockscreenShadeTransitionController,
- featureFlags, keyguardUnlockAnimationController, delayableExecutor,
- messageRouter, wallpaperManager, startingSurfaceOptional, activityLaunchAnimator,
- jankMonitor, deviceStateManager, wiredChargingRippleController,
- dreamManager, cameraLauncherLazy, lightRevealScrimViewModelLazy, lightRevealScrim, alternateBouncerInteractor,
- userTracker, fingerprintManager, tunerService, activityStarter, sysUiState, burnInProtectionController);
+ WallpaperNotifier wallpaperNotifier,
+ SmartSpaceController smartSpaceController
+ ) {
+ super(context, notificationsController, fragmentService, lightBarController, autoHideController, statusBarInitializer,
+ statusBarWindowController, statusBarWindowStateController, statusBarModeRepository, keyguardUpdateMonitor,
+ statusBarSignalPolicy, pulseExpansionHandler, notificationWakeUpCoordinator, keyguardBypassController, keyguardStateController,
+ headsUpManager, dynamicPrivacyController, falsingManager, falsingCollector, broadcastDispatcher, notificationGutsManager,
+ visualInterruptionDecisionProvider, shadeExpansionStateManager, keyguardViewMediator, displayMetrics, metricsLogger, shadeLogger,
+ javaAdapter, uiBgExecutor, shadeSurface, notificationMediaManager, notificationLockscreenUserManagerGoogle, remoteInputManager,
+ quickSettingsController, userSwitcherController, batteryController, colorExtractor, screenLifecycle, wakefulnessLifecycle,
+ powerInteractor, statusBarStateController, bubblesOptional, noteTaskControllerLazy, deviceProvisionedController,
+ navigationBarController, accessibilityFloatingMenuController, assistManagerLazy, configurationController, notificationShadeWindowController,
+ notificationShadeWindowViewControllerLazy, notificationStackScrollLayoutController, notificationPresenterLazy, notificationActivityStarterLazy,
+ notifLaunchAnimatorControllerProvider, dozeParameters, scrimController, biometricUnlockControllerLazy, authRippleController,
+ dozeServiceHost, backActionInteractor, powerManager, dozeScrimController, volumeComponent, commandQueue, commandQueueCallbacksLazy,
+ pluginManager, shadeController, windowRootViewVisibilityInteractor, statusBarKeyguardViewManager, viewMediatorCallback, initController, timeTickHandler,
+ pluginDependencyProvider, extensionController, userInfoControllerImpl, phoneStatusBarPolicy, keyguardIndicationControllerGoogle, demoModeController,
+ notificationShadeDepthControllerLazy, statusBarTouchableRegionManager, notificationIconAreaController, brightnessSliderFactory,
+ screenOffAnimationController, wallpaperController, statusBarHideIconsForBouncerManager, lockscreenShadeTransitionController, featureFlags,
+ keyguardUnlockAnimationController, delayableExecutor, messageRouter, wallpaperManager, startingSurfaceOptional, activityLaunchAnimator, jankMonitor,
+ deviceStateManager, wiredChargingRippleController, dreamManager, cameraLauncherLazy, lightRevealScrimViewModelLazy, lightRevealScrim,
+ alternateBouncerInteractor, userTracker, fingerprintManager, tunerService, activityStarter, sceneContainerFlags, sysUiState, burnInProtectionController);
mContext = context;
mBatteryStateChangeCallback = new BatteryController.BatteryStateChangeCallback() {
@Override
@@ -360,11 +349,6 @@
super.start();
mWallpaperNotifier.attach();
mBatteryController.observe(getLifecycle(), mBatteryStateChangeCallback);
- DockObserver dockObserver = (DockObserver) Dependency.get(DockManager.class);
- dockObserver.setDreamlinerGear((ImageView) getNotificationShadeWindowView().findViewById(R.id.dreamliner_gear));
- dockObserver.setPhotoPreview((FrameLayout) getNotificationShadeWindowView().findViewById(R.id.photo_preview));
- dockObserver.setIndicationController(new DockIndicationController(mContext, mKeyguardIndicationController, mStatusBarStateController, this));
- dockObserver.registerDockAlignInfo();
if (mReverseChargingViewControllerOptional.isPresent()) {
mReverseChargingViewControllerOptional.get().initialize();
}
diff --git a/SystemUIGoogle/src/com/google/android/systemui/statusbar/policy/BatteryControllerImplGoogle.java b/SystemUIGoogle/src/com/google/android/systemui/statusbar/policy/BatteryControllerImplGoogle.java
index 1560f65..1c8f1e4 100644
--- a/SystemUIGoogle/src/com/google/android/systemui/statusbar/policy/BatteryControllerImplGoogle.java
+++ b/SystemUIGoogle/src/com/google/android/systemui/statusbar/policy/BatteryControllerImplGoogle.java
@@ -32,6 +32,7 @@
import com.android.systemui.power.EnhancedEstimates;
import com.android.systemui.settings.UserContentResolverProvider;
import com.android.systemui.statusbar.policy.BatteryController;
+import com.android.systemui.statusbar.policy.BatteryControllerLogger;
import com.android.systemui.statusbar.policy.BatteryControllerImpl;
import com.google.android.systemui.reversecharging.ReverseChargingController;
import com.google.android.systemui.reversecharging.ReverseChargingChangeCallback;
@@ -50,8 +51,8 @@
private boolean mReverse;
private int mRtxLevel;
- public BatteryControllerImplGoogle(Context context, EnhancedEstimates enhancedEstimates, PowerManager powerManager, BroadcastDispatcher broadcastDispatcher, DemoModeController demoModeController, DumpManager dumpManager, Handler handler, Handler handler2, UserContentResolverProvider userContentResolverProvider, ReverseChargingController reverseChargingController) {
- super(context, enhancedEstimates, powerManager, broadcastDispatcher, demoModeController, dumpManager, handler, handler2);
+ public BatteryControllerImplGoogle(Context context, EnhancedEstimates enhancedEstimates, PowerManager powerManager, BroadcastDispatcher broadcastDispatcher, DemoModeController demoModeController, DumpManager dumpManager, BatteryControllerLogger logger,Handler handler, Handler handler2, UserContentResolverProvider userContentResolverProvider, ReverseChargingController reverseChargingController) {
+ super(context, enhancedEstimates, powerManager, broadcastDispatcher, demoModeController, dumpManager, logger, handler, handler2);
mReverseChargingController = reverseChargingController;
mContentResolverProvider = userContentResolverProvider;
mContentObserver = new ContentObserver(handler2) {
diff --git a/SystemUIGoogle/src/com/google/android/systemui/statusbar/policy/dagger/SystemUIGooglePolicyModule.java b/SystemUIGoogle/src/com/google/android/systemui/statusbar/policy/dagger/SystemUIGooglePolicyModule.java
index fa7ede0..e4f3158 100644
--- a/SystemUIGoogle/src/com/google/android/systemui/statusbar/policy/dagger/SystemUIGooglePolicyModule.java
+++ b/SystemUIGoogle/src/com/google/android/systemui/statusbar/policy/dagger/SystemUIGooglePolicyModule.java
@@ -29,6 +29,7 @@
import com.android.systemui.power.EnhancedEstimates;
import com.android.systemui.settings.UserContentResolverProvider;
import com.android.systemui.statusbar.policy.BatteryController;
+import com.android.systemui.statusbar.policy.BatteryControllerLogger;
import com.google.android.systemui.statusbar.policy.BatteryControllerImplGoogle;
import com.google.android.systemui.reversecharging.ReverseChargingController;
@@ -47,6 +48,7 @@
BroadcastDispatcher broadcastDispatcher,
DemoModeController demoModeController,
DumpManager dumpManager,
+ BatteryControllerLogger logger,
@Main Handler mainHandler,
@Background Handler bgHandler,
UserContentResolverProvider userContentResolverProvider,
@@ -58,6 +60,7 @@
broadcastDispatcher,
demoModeController,
dumpManager,
+ logger,
mainHandler,
bgHandler,
userContentResolverProvider,