Merge "Update code style for easier merging" into tm-qpr-dev am: 6ae3e60fe2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21128784 Change-Id: I5a3e3f60f324f3f4080fc58f8aefecbc9f9bca82 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -357,13 +357,22 @@ public class ThemeOverlayController implements CoreStartable, Dumpable {
|
|||||||
};
|
};
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
public ThemeOverlayController(Context context, BroadcastDispatcher broadcastDispatcher,
|
public ThemeOverlayController(
|
||||||
@Background Handler bgHandler, @Main Executor mainExecutor,
|
Context context,
|
||||||
@Background Executor bgExecutor, ThemeOverlayApplier themeOverlayApplier,
|
BroadcastDispatcher broadcastDispatcher,
|
||||||
SecureSettings secureSettings, WallpaperManager wallpaperManager,
|
@Background Handler bgHandler,
|
||||||
UserManager userManager, DeviceProvisionedController deviceProvisionedController,
|
@Main Executor mainExecutor,
|
||||||
UserTracker userTracker, DumpManager dumpManager, FeatureFlags featureFlags,
|
@Background Executor bgExecutor,
|
||||||
@Main Resources resources, WakefulnessLifecycle wakefulnessLifecycle) {
|
ThemeOverlayApplier themeOverlayApplier,
|
||||||
|
SecureSettings secureSettings,
|
||||||
|
WallpaperManager wallpaperManager,
|
||||||
|
UserManager userManager,
|
||||||
|
DeviceProvisionedController deviceProvisionedController,
|
||||||
|
UserTracker userTracker,
|
||||||
|
DumpManager dumpManager,
|
||||||
|
FeatureFlags featureFlags,
|
||||||
|
@Main Resources resources,
|
||||||
|
WakefulnessLifecycle wakefulnessLifecycle) {
|
||||||
mContext = context;
|
mContext = context;
|
||||||
mIsMonochromaticEnabled = featureFlags.isEnabled(Flags.MONOCHROMATIC_THEMES);
|
mIsMonochromaticEnabled = featureFlags.isEnabled(Flags.MONOCHROMATIC_THEMES);
|
||||||
mIsMonetEnabled = featureFlags.isEnabled(Flags.MONET);
|
mIsMonetEnabled = featureFlags.isEnabled(Flags.MONET);
|
||||||
|
|||||||
Reference in New Issue
Block a user