am 9641b929: Merge "Brightness slider no longer displays the automatic icon." into lmp-preview-dev

* commit '9641b929ae730241c37c8da21092cf56230aa05f':
  Brightness slider no longer displays the automatic icon.
This commit is contained in:
John Spurlock
2014-06-11 17:43:49 +00:00
committed by Android Git Automerger

View File

@@ -34,6 +34,7 @@ import java.util.ArrayList;
public class BrightnessController implements ToggleSlider.Listener {
private static final String TAG = "StatusBar.BrightnessController";
private static final boolean SHOW_AUTOMATIC_ICON = false;
/**
* {@link android.provider.Settings.System#SCREEN_AUTO_BRIGHTNESS_ADJ} uses the range [-1, 1].
@@ -232,7 +233,7 @@ public class BrightnessController implements ToggleSlider.Listener {
private void updateIcon(boolean automatic) {
if (mIcon != null) {
mIcon.setImageResource(automatic ?
mIcon.setImageResource(automatic && SHOW_AUTOMATIC_ICON ?
com.android.systemui.R.drawable.ic_qs_brightness_auto_on :
com.android.systemui.R.drawable.ic_qs_brightness_auto_off);
}