Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cefc41fd authored by Jeff Brown's avatar Jeff Brown Committed by Android (Google) Code Review
Browse files

Merge "Update references to PowerManager constants that have moved." into jb-dev

parents 72a84b78 defcb006

src/com/android/settings/BrightnessPreference.java

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ public class BrightnessPreference extends SeekBarDialogPreference implements 
    // doesn't set the backlight to 0 and get stuck

    private int mScreenBrightnessDim =

	    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;

src/com/android/settings/widget/SettingsAppWidgetProvider.java

+3 −3
Original line number Diff line number Diff line
@@ -97,9 +97,9 @@ public class SettingsAppWidgetProvider extends AppWidgetProvider { 
    /**

     * 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 MAXIMUM_BACKLIGHT = android.os.Power.BRIGHTNESS_ON;

    private static final int DEFAULT_BACKLIGHT = (int) (android.os.Power.BRIGHTNESS_ON * 0.4f);

    private static final int MINIMUM_BACKLIGHT = android.os.PowerManager.BRIGHTNESS_DIM + 10;

    private static final int MAXIMUM_BACKLIGHT = android.os.PowerManager.BRIGHTNESS_ON;

    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 */

    private static final int HALF_BRIGHTNESS_THRESHOLD = (int) (0.3 * MAXIMUM_BACKLIGHT);

    /** Minimum brightness at which the indicator is shown at full */