Merge "Update references to PowerManager constants that have moved." into jb-dev
This commit is contained in:
@@ -53,7 +53,7 @@ public class BrightnessPreference extends SeekBarDialogPreference implements
|
|||||||
// doesn't set the backlight to 0 and get stuck
|
// doesn't set the backlight to 0 and get stuck
|
||||||
private int mScreenBrightnessDim =
|
private int mScreenBrightnessDim =
|
||||||
getContext().getResources().getInteger(com.android.internal.R.integer.config_screenBrightnessDim);
|
getContext().getResources().getInteger(com.android.internal.R.integer.config_screenBrightnessDim);
|
||||||
private static final int MAXIMUM_BACKLIGHT = android.os.Power.BRIGHTNESS_ON;
|
private static final int MAXIMUM_BACKLIGHT = android.os.PowerManager.BRIGHTNESS_ON;
|
||||||
|
|
||||||
private static final int SEEK_BAR_RANGE = 10000;
|
private static final int SEEK_BAR_RANGE = 10000;
|
||||||
|
|
||||||
|
@@ -97,9 +97,9 @@ public class SettingsAppWidgetProvider extends AppWidgetProvider {
|
|||||||
/**
|
/**
|
||||||
* Minimum and maximum brightnesses. Don't go to 0 since that makes the display unusable
|
* Minimum and maximum brightnesses. Don't go to 0 since that makes the display unusable
|
||||||
*/
|
*/
|
||||||
private static final int MINIMUM_BACKLIGHT = android.os.Power.BRIGHTNESS_DIM + 10;
|
private static final int MINIMUM_BACKLIGHT = android.os.PowerManager.BRIGHTNESS_DIM + 10;
|
||||||
private static final int MAXIMUM_BACKLIGHT = android.os.Power.BRIGHTNESS_ON;
|
private static final int MAXIMUM_BACKLIGHT = android.os.PowerManager.BRIGHTNESS_ON;
|
||||||
private static final int DEFAULT_BACKLIGHT = (int) (android.os.Power.BRIGHTNESS_ON * 0.4f);
|
private static final int DEFAULT_BACKLIGHT = (int) (android.os.PowerManager.BRIGHTNESS_ON * 0.4f);
|
||||||
/** Minimum brightness at which the indicator is shown at half-full and ON */
|
/** Minimum brightness at which the indicator is shown at half-full and ON */
|
||||||
private static final int HALF_BRIGHTNESS_THRESHOLD = (int) (0.3 * MAXIMUM_BACKLIGHT);
|
private static final int HALF_BRIGHTNESS_THRESHOLD = (int) (0.3 * MAXIMUM_BACKLIGHT);
|
||||||
/** Minimum brightness at which the indicator is shown at full */
|
/** Minimum brightness at which the indicator is shown at full */
|
||||||
|
Reference in New Issue
Block a user