Merge "Remove display VR brightness clients" (167ce476) · Commits · e / os / android_frameworks_base

core/java/android/os/PowerManager.java

+1 −51

Original line number	Diff line number	Diff line
		@@ -533,10 +533,7 @@ public final class PowerManager {
		BRIGHTNESS_CONSTRAINT_TYPE_MAXIMUM,
		BRIGHTNESS_CONSTRAINT_TYPE_DEFAULT,
		BRIGHTNESS_CONSTRAINT_TYPE_DIM,
		BRIGHTNESS_CONSTRAINT_TYPE_DOZE,
		BRIGHTNESS_CONSTRAINT_TYPE_MINIMUM_VR,
		BRIGHTNESS_CONSTRAINT_TYPE_MAXIMUM_VR,
		BRIGHTNESS_CONSTRAINT_TYPE_DEFAULT_VR
		BRIGHTNESS_CONSTRAINT_TYPE_DOZE
		})
		@Retention(RetentionPolicy.SOURCE)
		public @interface BrightnessConstraint{}
		@@ -570,24 +567,6 @@ public final class PowerManager {
		*/
		public static final int BRIGHTNESS_CONSTRAINT_TYPE_DOZE = 4;

		/**
		* Brightness constraint type: minimum allowed value.
		* @hide
		*/
		public static final int BRIGHTNESS_CONSTRAINT_TYPE_MINIMUM_VR = 5;

		/**
		* Brightness constraint type: minimum allowed value.
		* @hide
		*/
		public static final int BRIGHTNESS_CONSTRAINT_TYPE_MAXIMUM_VR = 6;

		/**
		* Brightness constraint type: minimum allowed value.
		* @hide
		*/
		public static final int BRIGHTNESS_CONSTRAINT_TYPE_DEFAULT_VR = 7;

		/**
		* @hide
		*/
		@@ -1210,35 +1189,6 @@ public final class PowerManager {
		com.android.internal.R.integer.config_screenBrightnessSettingDefault);
		}

		/**
		* Gets the minimum supported screen brightness setting for VR Mode.
		* @hide
		*/
		public int getMinimumScreenBrightnessForVrSetting() {
		return mContext.getResources().getInteger(
		com.android.internal.R.integer.config_screenBrightnessForVrSettingMinimum);
		}

		/**
		* Gets the maximum supported screen brightness setting for VR Mode.
		* The screen may be allowed to become dimmer than this value but
		* this is the maximum value that can be set by the user.
		* @hide
		*/
		public int getMaximumScreenBrightnessForVrSetting() {
		return mContext.getResources().getInteger(
		com.android.internal.R.integer.config_screenBrightnessForVrSettingMaximum);
		}

		/**
		* Gets the default screen brightness for VR setting.
		* @hide
		*/
		public int getDefaultScreenBrightnessForVrSetting() {
		return mContext.getResources().getInteger(
		com.android.internal.R.integer.config_screenBrightnessForVrSettingDefault);
		}

		/**
		* Gets a float screen brightness setting.
		* @hide

core/java/android/provider/Settings.java

+0 −17

Original line number	Diff line number	Diff line
		@@ -4637,21 +4637,6 @@ public final class Settings {
		@Readable
		public static final String SCREEN_BRIGHTNESS = "screen_brightness";

		/**
		* The screen backlight brightness between 0 and 255.
		* @hide
		*/
		@Readable
		public static final String SCREEN_BRIGHTNESS_FOR_VR = "screen_brightness_for_vr";

		/**
		* The screen backlight brightness between 0.0f and 1.0f.
		* @hide
		*/
		@Readable
		public static final String SCREEN_BRIGHTNESS_FOR_VR_FLOAT =
		"screen_brightness_for_vr_float";

		/**
		* The screen backlight brightness between 0.0f and 1.0f.
		* @hide
		@@ -5637,8 +5622,6 @@ public final class Settings {
		PUBLIC_SETTINGS.add(SCREEN_OFF_TIMEOUT);
		PUBLIC_SETTINGS.add(SCREEN_BRIGHTNESS);
		PUBLIC_SETTINGS.add(SCREEN_BRIGHTNESS_FLOAT);
		PUBLIC_SETTINGS.add(SCREEN_BRIGHTNESS_FOR_VR);
		PUBLIC_SETTINGS.add(SCREEN_BRIGHTNESS_FOR_VR_FLOAT);
		PUBLIC_SETTINGS.add(SCREEN_BRIGHTNESS_MODE);
		PUBLIC_SETTINGS.add(MODE_RINGER_STREAMS_AFFECTED);
		PUBLIC_SETTINGS.add(MUTE_STREAMS_AFFECTED);

core/res/res/values/config.xml

+0 −24

Original line number	Diff line number	Diff line
		@@ -1371,30 +1371,6 @@
		Must be in the range specified by minimum and maximum. -->
		<item name="config_screenBrightnessSettingDefaultFloat" format="float" type="dimen">-2</item>

		<!-- Note: This setting is deprecated, please use
		config_screenBrightnessSettingForVrDefaultFloat instead -->
		<integer name="config_screenBrightnessForVrSettingDefault">86</integer>

		<!-- Note: This setting is deprecated, please use
		config_screenBrightnessSettingForVrMinimumFloat instead -->
		<integer name="config_screenBrightnessForVrSettingMinimum">79</integer>

		<!-- Note: This setting is deprecated, please use
		config_screenBrightnessSettingForVrMaximumFloat instead -->
		<integer name="config_screenBrightnessForVrSettingMaximum">255</integer>

		<!-- Default screen brightness for VR setting as a float.
		Equivalent to 86/255-->
		<item name="config_screenBrightnessSettingForVrDefaultFloat" format="float" type="dimen">0.33464</item>

		<!-- Minimum screen brightness setting allowed for VR. Device panels start increasing pulse
		width as brightness decreases below this threshold as float.
		Equivalent to 79/255 -->
		<item name="config_screenBrightnessSettingForVrMinimumFloat" format="float" type="dimen">0.307087</item>

		<!-- Maximum screen brightness setting allowed for VR as float. -->
		<item name="config_screenBrightnessSettingForVrMaximumFloat" format="float" type="dimen">1.0</item>

		<!-- Screen brightness used to dim the screen while dozing in a very low power state.
		May be less than the minimum allowed brightness setting
		that can be set by the user. -->

core/res/res/values/symbols.xml

+0 −6

Original line number	Diff line number	Diff line
		@@ -2062,12 +2062,6 @@
		<java-symbol type="integer" name="config_screenBrightnessSettingMinimum" />
		<java-symbol type="integer" name="config_screenBrightnessSettingMaximum" />
		<java-symbol type="integer" name="config_screenBrightnessSettingDefault" />
		<java-symbol type="integer" name="config_screenBrightnessForVrSettingDefault" />
		<java-symbol type="integer" name="config_screenBrightnessForVrSettingMaximum" />
		<java-symbol type="integer" name="config_screenBrightnessForVrSettingMinimum" />
		<java-symbol type="dimen" name="config_screenBrightnessSettingForVrMinimumFloat" />
		<java-symbol type="dimen" name="config_screenBrightnessSettingForVrMaximumFloat" />
		<java-symbol type="dimen" name="config_screenBrightnessSettingForVrDefaultFloat" />
		<java-symbol type="dimen" name="config_screenBrightnessSettingMinimumFloat" />
		<java-symbol type="dimen" name="config_screenBrightnessSettingMaximumFloat" />
		<java-symbol type="dimen" name="config_screenBrightnessSettingDefaultFloat" />

packages/SettingsProvider/src/android/provider/settings/validators/SystemSettingsValidators.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -111,7 +111,6 @@ public class SystemSettingsValidators {
		});
		VALIDATORS.put(System.DISPLAY_COLOR_MODE_VENDOR_HINT, ANY_STRING_VALIDATOR);
		VALIDATORS.put(System.SCREEN_OFF_TIMEOUT, NON_NEGATIVE_INTEGER_VALIDATOR);
		VALIDATORS.put(System.SCREEN_BRIGHTNESS_FOR_VR, new InclusiveIntegerRangeValidator(0, 255));
		VALIDATORS.put(System.SCREEN_BRIGHTNESS_MODE, BOOLEAN_VALIDATOR);
		VALIDATORS.put(System.ADAPTIVE_SLEEP, BOOLEAN_VALIDATOR);
		VALIDATORS.put(System.MODE_RINGER_STREAMS_AFFECTED, NON_NEGATIVE_INTEGER_VALIDATOR);