Merge "Fix unresponsive brightness slider after font size change" into nyc-dev

This commit is contained in:
Adrian Roos
2016-06-16 19:25:47 +00:00
committed by Android (Google) Code Review

View File

@@ -72,6 +72,8 @@ public class QSPanel extends LinearLayout implements Tunable, Callback {
private QSCustomizer mCustomizePanel;
private Record mDetailRecord;
private BrightnessMirrorController mBrightnessMirrorController;
public QSPanel(Context context) {
this(context, null);
}
@@ -159,7 +161,7 @@ public class QSPanel extends LinearLayout implements Tunable, Callback {
}
public void setBrightnessMirror(BrightnessMirrorController c) {
super.onFinishInflate();
mBrightnessMirrorController = c;
ToggleSlider brightnessSlider = (ToggleSlider) findViewById(R.id.brightness_slider);
ToggleSlider mirror = (ToggleSlider) c.getMirror().findViewById(R.id.brightness_slider);
brightnessSlider.setMirror(mirror);
@@ -205,6 +207,11 @@ public class QSPanel extends LinearLayout implements Tunable, Callback {
protected void onConfigurationChanged(Configuration newConfig) {
super.onConfigurationChanged(newConfig);
mFooter.onConfigurationChanged();
if (mBrightnessMirrorController != null) {
// Reload the mirror in case it got reinflated but we didn't.
setBrightnessMirror(mBrightnessMirrorController);
}
}
public void onCollapse() {