Sysui: Add support for view injection
Test: Existing tests pass
Change-Id: Ic6931ebec38ca9514e9368239dd9502ae2dee33c
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
index 3cecff0..f2f83c0 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
@@ -17,6 +17,8 @@
import static android.app.StatusBarManager.DISABLE2_QUICK_SETTINGS;
import static android.provider.Settings.System.SHOW_BATTERY_PERCENT;
+import static com.android.systemui.util.InjectionInflationController.VIEW_CONTEXT;
+
import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;
import android.annotation.ColorInt;
@@ -58,7 +60,6 @@
import com.android.settingslib.Utils;
import com.android.systemui.BatteryMeterView;
-import com.android.systemui.Dependency;
import com.android.systemui.Prefs;
import com.android.systemui.R;
import com.android.systemui.plugins.ActivityStarter;
@@ -84,6 +85,9 @@
import java.util.Locale;
import java.util.Objects;
+import javax.inject.Inject;
+import javax.inject.Named;
+
/**
* View that contains the top-most bits of the screen (primarily the status bar with date, time, and
* battery) and also contains the {@link QuickQSPanel} along with some of the panel's inner
@@ -102,6 +106,11 @@
public static final int MAX_TOOLTIP_SHOWN_COUNT = 2;
private final Handler mHandler = new Handler();
+ private final BatteryController mBatteryController;
+ private final NextAlarmController mAlarmController;
+ private final ZenModeController mZenController;
+ private final StatusBarIconController mStatusBarIconController;
+ private final ActivityStarter mActivityStarter;
private QSPanel mQsPanel;
@@ -141,8 +150,6 @@
private TextView mBatteryRemainingText;
private boolean mShowBatteryPercentAndEstimate;
- private NextAlarmController mAlarmController;
- private ZenModeController mZenController;
private PrivacyItemController mPrivacyItemController;
/** Counts how many times the long press tooltip has been shown to the user. */
private int mShownCount;
@@ -172,10 +179,17 @@
}
};
- public QuickStatusBarHeader(Context context, AttributeSet attrs) {
+ @Inject
+ public QuickStatusBarHeader(@Named(VIEW_CONTEXT) Context context, AttributeSet attrs,
+ NextAlarmController nextAlarmController, ZenModeController zenModeController,
+ BatteryController batteryController, StatusBarIconController statusBarIconController,
+ ActivityStarter activityStarter) {
super(context, attrs);
- mAlarmController = Dependency.get(NextAlarmController.class);
- mZenController = Dependency.get(ZenModeController.class);
+ mAlarmController = nextAlarmController;
+ mZenController = zenModeController;
+ mBatteryController = batteryController;
+ mStatusBarIconController = statusBarIconController;
+ mActivityStarter = activityStarter;
mPrivacyItemController = new PrivacyItemController(context, mPICCallback);
mShownCount = getStoredShownCount();
}
@@ -405,8 +419,7 @@
if (!mShowBatteryPercentAndEstimate) {
return;
}
- mBatteryRemainingText.setText(
- Dependency.get(BatteryController.class).getEstimatedTimeRemainingString());
+ mBatteryRemainingText.setText(mBatteryController.getEstimatedTimeRemainingString());
}
public void setExpanded(boolean expanded) {
@@ -472,7 +485,7 @@
@Override
public void onAttachedToWindow() {
super.onAttachedToWindow();
- Dependency.get(StatusBarIconController.class).addIconGroup(mIconManager);
+ mStatusBarIconController.addIconGroup(mIconManager);
requestApplyInsets();
mContext.getContentResolver().registerContentObserver(
Settings.System.getUriFor(SHOW_BATTERY_PERCENT), false, mPercentSettingObserver,
@@ -515,7 +528,7 @@
@VisibleForTesting
public void onDetachedFromWindow() {
setListening(false);
- Dependency.get(StatusBarIconController.class).removeIconGroup(mIconManager);
+ mStatusBarIconController.removeIconGroup(mIconManager);
mContext.getContentResolver().unregisterContentObserver(mPercentSettingObserver);
super.onDetachedFromWindow();
}
@@ -544,10 +557,10 @@
@Override
public void onClick(View v) {
if (v == mClockView) {
- Dependency.get(ActivityStarter.class).postStartActivityDismissingKeyguard(new Intent(
+ mActivityStarter.postStartActivityDismissingKeyguard(new Intent(
AlarmClock.ACTION_SHOW_ALARMS),0);
} else if (v == mBatteryMeterView) {
- Dependency.get(ActivityStarter.class).postStartActivityDismissingKeyguard(new Intent(
+ mActivityStarter.postStartActivityDismissingKeyguard(new Intent(
Intent.ACTION_POWER_USAGE_SUMMARY),0);
} else if (v == mPrivacyChip) {
Handler mUiHandler = new Handler(Looper.getMainLooper());