[Dagger] Remove Dependency.get from BrightnessController.
Test: atest + manual Bug: 138786270 Change-Id: Ic8ab6bd368746a7d18ff6ef4b4ec16ffdab41bb4
This commit is contained in:
@@ -30,7 +30,6 @@ import android.hardware.display.DisplayManager.DisplayListener;
|
||||
import android.net.Uri;
|
||||
import android.os.AsyncTask;
|
||||
import android.os.Handler;
|
||||
import android.os.Looper;
|
||||
import android.os.Message;
|
||||
import android.os.PowerManager;
|
||||
import android.os.RemoteException;
|
||||
@@ -47,8 +46,8 @@ import com.android.internal.display.BrightnessSynchronizer;
|
||||
import com.android.internal.logging.MetricsLogger;
|
||||
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
|
||||
import com.android.settingslib.RestrictedLockUtilsInternal;
|
||||
import com.android.systemui.Dependency;
|
||||
import com.android.systemui.broadcast.BroadcastDispatcher;
|
||||
import com.android.systemui.dagger.qualifiers.Background;
|
||||
import com.android.systemui.settings.CurrentUserTracker;
|
||||
import com.android.systemui.statusbar.policy.BrightnessMirrorController;
|
||||
|
||||
@@ -288,12 +287,15 @@ public class BrightnessController implements ToggleSlider.Listener, MirroredBrig
|
||||
}
|
||||
};
|
||||
|
||||
public BrightnessController(Context context, ToggleSlider control,
|
||||
BroadcastDispatcher broadcastDispatcher) {
|
||||
public BrightnessController(
|
||||
Context context,
|
||||
ToggleSlider control,
|
||||
BroadcastDispatcher broadcastDispatcher,
|
||||
@Background Handler bgHandler) {
|
||||
mContext = context;
|
||||
mControl = control;
|
||||
mControl.setMax(GAMMA_SPACE_MAX);
|
||||
mBackgroundHandler = new Handler((Looper) Dependency.get(Dependency.BG_LOOPER));
|
||||
mBackgroundHandler = bgHandler;
|
||||
mUserTracker = new CurrentUserTracker(broadcastDispatcher) {
|
||||
@Override
|
||||
public void onUserSwitched(int newUserId) {
|
||||
@@ -464,16 +466,25 @@ public class BrightnessController implements ToggleSlider.Listener, MirroredBrig
|
||||
public static class Factory {
|
||||
private final Context mContext;
|
||||
private final BroadcastDispatcher mBroadcastDispatcher;
|
||||
private final Handler mBackgroundHandler;
|
||||
|
||||
@Inject
|
||||
public Factory(Context context, BroadcastDispatcher broadcastDispatcher) {
|
||||
public Factory(
|
||||
Context context,
|
||||
BroadcastDispatcher broadcastDispatcher,
|
||||
@Background Handler bgHandler) {
|
||||
mContext = context;
|
||||
mBroadcastDispatcher = broadcastDispatcher;
|
||||
mBackgroundHandler = bgHandler;
|
||||
}
|
||||
|
||||
/** Create a {@link BrightnessController} */
|
||||
public BrightnessController create(ToggleSlider toggleSlider) {
|
||||
return new BrightnessController(mContext, toggleSlider, mBroadcastDispatcher);
|
||||
return new BrightnessController(
|
||||
mContext,
|
||||
toggleSlider,
|
||||
mBroadcastDispatcher,
|
||||
mBackgroundHandler);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -21,6 +21,7 @@ import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.os.Bundle;
|
||||
import android.os.Handler;
|
||||
import android.view.Gravity;
|
||||
import android.view.KeyEvent;
|
||||
import android.view.View;
|
||||
@@ -32,6 +33,7 @@ import com.android.internal.logging.MetricsLogger;
|
||||
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
|
||||
import com.android.systemui.R;
|
||||
import com.android.systemui.broadcast.BroadcastDispatcher;
|
||||
import com.android.systemui.dagger.qualifiers.Background;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
@@ -41,13 +43,16 @@ public class BrightnessDialog extends Activity {
|
||||
private BrightnessController mBrightnessController;
|
||||
private final BrightnessSlider.Factory mToggleSliderFactory;
|
||||
private final BroadcastDispatcher mBroadcastDispatcher;
|
||||
private final Handler mBackgroundHandler;
|
||||
|
||||
@Inject
|
||||
public BrightnessDialog(
|
||||
BroadcastDispatcher broadcastDispatcher,
|
||||
BrightnessSlider.Factory factory) {
|
||||
BrightnessSlider.Factory factory,
|
||||
@Background Handler bgHandler) {
|
||||
mBroadcastDispatcher = broadcastDispatcher;
|
||||
mToggleSliderFactory = factory;
|
||||
mBackgroundHandler = bgHandler;
|
||||
}
|
||||
|
||||
|
||||
@@ -76,7 +81,8 @@ public class BrightnessDialog extends Activity {
|
||||
controller.init();
|
||||
frame.addView(controller.getRootView(), MATCH_PARENT, WRAP_CONTENT);
|
||||
|
||||
mBrightnessController = new BrightnessController(this, controller, mBroadcastDispatcher);
|
||||
mBrightnessController = new BrightnessController(
|
||||
this, controller, mBroadcastDispatcher, mBackgroundHandler);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in New Issue
Block a user