Merge "Add support for brightness as a float" (004e36da) · Commits · e / os / android_frameworks_base

core/java/android/app/admin/DevicePolicyManager.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -8723,6 +8723,7 @@ public class DevicePolicyManager {
		@StringDef({
		Settings.System.SCREEN_BRIGHTNESS_MODE,
		Settings.System.SCREEN_BRIGHTNESS,
		Settings.System.SCREEN_BRIGHTNESS_FLOAT,
		Settings.System.SCREEN_OFF_TIMEOUT
		})
		@Retention(RetentionPolicy.SOURCE)

core/java/android/hardware/display/DisplayManager.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -766,11 +766,11 @@ public final class DisplayManager {
		* Requires the {@link android.Manifest.permission#CONTROL_DISPLAY_BRIGHTNESS} permission.
		* </p>
		*
		* @param brightness The brightness value from 0 to 255.
		* @param brightness The brightness value from 0.0f to 1.0f.
		*
		* @hide Requires signature permission.
		*/
		public void setTemporaryBrightness(int brightness) {
		public void setTemporaryBrightness(float brightness) {
		mGlobal.setTemporaryBrightness(brightness);
		}

core/java/android/hardware/display/DisplayManagerGlobal.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -616,7 +616,7 @@ public final class DisplayManagerGlobal {
		*
		* @hide Requires signature permission.
		*/
		public void setTemporaryBrightness(int brightness) {
		public void setTemporaryBrightness(float brightness) {
		try {
		mDm.setTemporaryBrightness(brightness);
		} catch (RemoteException ex) {

core/java/android/hardware/display/DisplayManagerInternal.java

+9 −7

Original line number	Diff line number	Diff line
		@@ -268,8 +268,9 @@ public abstract class DisplayManagerInternal {
		// nearby, turning it off temporarily until the object is moved away.
		public boolean useProximitySensor;

		// An override of the screen brightness. Set to -1 is used if there's no override.
		public int screenBrightnessOverride;
		// An override of the screen brightness.
		// Set to PowerManager.BRIGHTNESS_INVALID if there's no override.
		public float screenBrightnessOverride;

		// An override of the screen auto-brightness adjustment factor in the range -1 (dimmer) to
		// 1 (brighter). Set to Float.NaN if there's no override.
		@@ -300,18 +301,18 @@ public abstract class DisplayManagerInternal {
		public boolean blockScreenOn;

		// Overrides the policy for adjusting screen brightness and state while dozing.
		public int dozeScreenBrightness;
		public int dozeScreenState;
		public float dozeScreenBrightness;

		public DisplayPowerRequest() {
		policy = POLICY_BRIGHT;
		useProximitySensor = false;
		screenBrightnessOverride = -1;
		screenBrightnessOverride = PowerManager.BRIGHTNESS_INVALID_FLOAT;
		useAutoBrightness = false;
		screenAutoBrightnessAdjustmentOverride = Float.NaN;
		screenLowPowerBrightnessFactor = 0.5f;
		blockScreenOn = false;
		dozeScreenBrightness = PowerManager.BRIGHTNESS_DEFAULT;
		dozeScreenBrightness = PowerManager.BRIGHTNESS_INVALID_FLOAT;
		dozeScreenState = Display.STATE_UNKNOWN;
		}

		@@ -351,7 +352,8 @@ public abstract class DisplayManagerInternal {
		return other != null
		&& policy == other.policy
		&& useProximitySensor == other.useProximitySensor
		&& screenBrightnessOverride == other.screenBrightnessOverride
		&& floatEquals(screenBrightnessOverride,
		other.screenBrightnessOverride)
		&& useAutoBrightness == other.useAutoBrightness
		&& floatEquals(screenAutoBrightnessAdjustmentOverride,
		other.screenAutoBrightnessAdjustmentOverride)
		@@ -360,7 +362,7 @@ public abstract class DisplayManagerInternal {
		&& blockScreenOn == other.blockScreenOn
		&& lowPowerMode == other.lowPowerMode
		&& boostScreenBrightness == other.boostScreenBrightness
		&& dozeScreenBrightness == other.dozeScreenBrightness
		&& floatEquals(dozeScreenBrightness, other.dozeScreenBrightness)
		&& dozeScreenState == other.dozeScreenState;
		}

core/java/android/hardware/display/IDisplayManager.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -115,7 +115,7 @@ interface IDisplayManager {
		boolean isMinimalPostProcessingRequested(int displayId);

		// Temporarily sets the display brightness.
		void setTemporaryBrightness(int brightness);
		void setTemporaryBrightness(float brightness);

		// Temporarily sets the auto brightness adjustment factor.
		void setTemporaryAutoBrightnessAdjustment(float adjustment);