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

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

Browse Source
This commit is contained in:
Adrian Roos
2016-06-16 19:25:47 +00:00
committed by Android (Google) Code Review
parent 60585e6c54 429c962179
commit db81dd9d2e
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/SystemUI/src/com/android/systemui/qs/QSPanel.java
View File

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