Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Dagger] Remove Dependency.get from VolumeDialogComponent." into sc-v2-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-08-11 21:33:03 +00:00
committed by Android (Google) Code Review
parent ef994701aa f6ce0ea4a9
commit 645494cc8d
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
packages/SystemUI/src/com/android/systemui/volume/VolumeDialogComponent.java
View File

@@ -26,7 +26,6 @@ import android.os.Bundle;
import android.view.WindowManager.LayoutParams; import android.view.WindowManager.LayoutParams;
import com.android.settingslib.applications.InterestingConfigChanges; import com.android.settingslib.applications.InterestingConfigChanges;
import com.android.systemui.Dependency;
import com.android.systemui.dagger.SysUISingleton; import com.android.systemui.dagger.SysUISingleton;
import com.android.systemui.demomode.DemoMode; import com.android.systemui.demomode.DemoMode;
import com.android.systemui.demomode.DemoModeController; import com.android.systemui.demomode.DemoModeController;
@@ -67,6 +66,7 @@ public class VolumeDialogComponent implements VolumeComponent, TunerService.Tuna
ActivityInfo.CONFIG_FONT_SCALE | ActivityInfo.CONFIG_LOCALE ActivityInfo.CONFIG_FONT_SCALE | ActivityInfo.CONFIG_LOCALE
| ActivityInfo.CONFIG_ASSETS_PATHS | ActivityInfo.CONFIG_UI_MODE); | ActivityInfo.CONFIG_ASSETS_PATHS | ActivityInfo.CONFIG_UI_MODE);
private final KeyguardViewMediator mKeyguardViewMediator; private final KeyguardViewMediator mKeyguardViewMediator;
private final ActivityStarter mActivityStarter;
private VolumeDialog mDialog; private VolumeDialog mDialog;
private VolumePolicy mVolumePolicy = new VolumePolicy( private VolumePolicy mVolumePolicy = new VolumePolicy(
DEFAULT_VOLUME_DOWN_TO_ENTER_SILENT, // volumeDownToEnterSilent DEFAULT_VOLUME_DOWN_TO_ENTER_SILENT, // volumeDownToEnterSilent
@@ -79,16 +79,20 @@ public class VolumeDialogComponent implements VolumeComponent, TunerService.Tuna
public VolumeDialogComponent( public VolumeDialogComponent(
Context context, Context context,
KeyguardViewMediator keyguardViewMediator, KeyguardViewMediator keyguardViewMediator,
ActivityStarter activityStarter,
VolumeDialogControllerImpl volumeDialogController, VolumeDialogControllerImpl volumeDialogController,
DemoModeController demoModeController) { DemoModeController demoModeController,
PluginDependencyProvider pluginDependencyProvider,
ExtensionController extensionController,
TunerService tunerService) {
mContext = context; mContext = context;
mKeyguardViewMediator = keyguardViewMediator; mKeyguardViewMediator = keyguardViewMediator;
mActivityStarter = activityStarter;
mController = volumeDialogController; mController = volumeDialogController;
mController.setUserActivityListener(this); mController.setUserActivityListener(this);
// Allow plugins to reference the VolumeDialogController. // Allow plugins to reference the VolumeDialogController.
Dependency.get(PluginDependencyProvider.class) pluginDependencyProvider.allowPluginDependency(VolumeDialogController.class);
.allowPluginDependency(VolumeDialogController.class); extensionController.newExtension(VolumeDialog.class)
Dependency.get(ExtensionController.class).newExtension(VolumeDialog.class)
.withPlugin(VolumeDialog.class) .withPlugin(VolumeDialog.class)
.withDefault(this::createDefault) .withDefault(this::createDefault)
.withCallback(dialog -> { .withCallback(dialog -> {
@@ -99,7 +103,7 @@ public class VolumeDialogComponent implements VolumeComponent, TunerService.Tuna
mDialog.init(LayoutParams.TYPE_VOLUME_OVERLAY, mVolumeDialogCallback); mDialog.init(LayoutParams.TYPE_VOLUME_OVERLAY, mVolumeDialogCallback);
}).build(); }).build();
applyConfiguration(); applyConfiguration();
Dependency.get(TunerService.class).addTunable(this, VOLUME_DOWN_SILENT, VOLUME_UP_SILENT, tunerService.addTunable(this, VOLUME_DOWN_SILENT, VOLUME_UP_SILENT,
VOLUME_SILENT_DO_NOT_DISTURB); VOLUME_SILENT_DO_NOT_DISTURB);
demoModeController.addCallback(this); demoModeController.addCallback(this);
} }
@@ -189,8 +193,7 @@ public class VolumeDialogComponent implements VolumeComponent, TunerService.Tuna
} }
private void startSettings(Intent intent) { private void startSettings(Intent intent) {
Dependency.get(ActivityStarter.class).startActivity(intent, mActivityStarter.startActivity(intent, true /* onlyProvisioned */, true /* dismissShade */);
true /* onlyProvisioned */, true /* dismissShade */);
} }
private final VolumeDialogImpl.Callback mVolumeDialogCallback = new VolumeDialogImpl.Callback() { private final VolumeDialogImpl.Callback mVolumeDialogCallback = new VolumeDialogImpl.Callback() {