Skip to content

Commit a273d0a

Browse files
committed
Add a toggle to enable Brightness slider buttons [1/2]
1 parent 971622e commit a273d0a

2 files changed

Lines changed: 20 additions & 3 deletions

File tree

core/java/android/provider/Settings.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4600,6 +4600,13 @@ public boolean validate(String value) {
46004600
*/
46014601
public static final String CUSTOM_CARRIER_LABEL = "custom_carrier_label";
46024602

4603+
/**
4604+
* Whether to show the two buttons besides the brightness slider
4605+
* Enabled by default
4606+
* @hide
4607+
*/
4608+
public static final String SHOW_BRIGHTNESS_BUTTONS = "show_brightness_buttons";
4609+
46034610
/**
46044611
* Settings to backup. This is here so that it's in the same place as the settings
46054612
* keys and easy to update.

packages/SystemUI/src/com/android/systemui/qs/QSPanel.java

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public class QSPanel extends LinearLayout implements Tunable, Callback, Brightne
8383
protected final Context mContext;
8484
protected final ArrayList<TileRecord> mRecords = new ArrayList<TileRecord>();
8585
protected final View mBrightnessView;
86-
protected final ImageView mBrightnessIcon;
86+
protected final ImageView mBrightnessIcon, mMinBrightness , mMaxBrightness;
8787
private final H mHandler = new H();
8888
private final View mPageIndicator;
8989
private final MetricsLogger mMetricsLogger = Dependency.get(MetricsLogger.class);
@@ -130,7 +130,7 @@ public QSPanel(final Context context, AttributeSet attrs) {
130130
mBrightnessIcon,
131131
mBrightnessView.findViewById(R.id.brightness_slider));
132132

133-
ImageView mMinBrightness = mBrightnessView.findViewById(R.id.brightness_left);
133+
mMinBrightness =(ImageView) mBrightnessView.findViewById(R.id.brightness_left);
134134
mMinBrightness.setOnClickListener(new View.OnClickListener() {
135135
@Override
136136
public void onClick(View v) {
@@ -163,7 +163,7 @@ public boolean onLongClick(View v) {
163163
}
164164
});
165165

166-
ImageView mMaxBrightness = mBrightnessView.findViewById(R.id.brightness_right);
166+
mMaxBrightness = (ImageView) mBrightnessView.findViewById(R.id.brightness_right);
167167
mMaxBrightness.setOnClickListener(new View.OnClickListener() {
168168
@Override
169169
public void onClick(View v) {
@@ -311,6 +311,15 @@ private void setBrightnessIcon() {
311311
updateResources();
312312
}
313313

314+
private void showButtons() {
315+
boolean showButtonsEnabled = Settings.System.getIntForUser(
316+
mContext.getContentResolver(), Settings.System.SHOW_BRIGHTNESS_BUTTONS,
317+
1, UserHandle.USER_CURRENT) == 1;
318+
mMinBrightness.setVisibility(showButtonsEnabled ? View.VISIBLE : View.GONE);
319+
mMaxBrightness.setVisibility(showButtonsEnabled ? View.VISIBLE : View.GONE);
320+
updateResources();
321+
}
322+
314323
public void setBrightnessMirror(BrightnessMirrorController c) {
315324
if (mBrightnessMirrorController != null) {
316325
mBrightnessMirrorController.removeCallback(this);
@@ -429,6 +438,7 @@ public void setListening(boolean listening) {
429438
}
430439
}
431440
setBrightnessIcon();
441+
showButtons();
432442
}
433443

434444
public void refreshAllTiles() {

0 commit comments

Comments
 (0)