Merge "Make ActivityInfo.preferMinimalPostProcessing a flag" into rvc-dev am:... (0e70992e) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −1

core/java/android/app/Activity.java

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -7943,7 +7943,8 @@ public class Activity extends ContextThemeWrapper
	mCurrentConfig = config;		mCurrentConfig = config;

	mWindow.setColorMode(info.colorMode);		mWindow.setColorMode(info.colorMode);
	mWindow.setPreferMinimalPostProcessing(info.preferMinimalPostProcessing);		mWindow.setPreferMinimalPostProcessing(
			(info.flags & ActivityInfo.FLAG_PREFER_MINIMAL_POST_PROCESSING) != 0);

	setAutofillOptions(application.getAutofillOptions());		setAutofillOptions(application.getAutofillOptions());
	setContentCaptureOptions(application.getContentCaptureOptions());		setContentCaptureOptions(application.getContentCaptureOptions());

core/java/android/content/pm/ActivityInfo.java

+7 −40

Original line number	Original line	Diff line number	Diff line
	@@ -289,43 +289,6 @@ public class ActivityInfo extends ComponentInfo implements Parcelable {
	@ColorMode		@ColorMode
	public int colorMode = COLOR_MODE_DEFAULT;		public int colorMode = COLOR_MODE_DEFAULT;

	/**
	* Value for {@link #preferMinimalPostProcessing} indicating that by default
	* minimal post processing is not preferred.
	*
	* @see android.R.attr#preferMinimalPostProcessing
	* @hide
	*/
	public static final boolean MINIMAL_POST_PROCESSING_DEFAULT = false;

	/**
	* Indicates whether the activity wants the connected display to do minimal post processing on
	* the produced image or video frames. This will only be requested if this activity's main
	* window is visible on the screen.
	*
	* <p>This setting should be used when low latency has a higher priority than image enhancement
	* processing (e.g. for games or video conferencing).
	*
	* <p>If the Display sink is connected via HDMI, the device will begin to send infoframes with
	* Auto Low Latency Mode enabled and Game Content Type. This will switch the connected display
	* to a minimal image processing mode (if available), which reduces latency, improving the user
	* experience for gaming or video conferencing applications. For more information, see HDMI 2.1
	* specification.
	*
	* <p>If the Display sink has an internal connection or uses some other protocol than HDMI,
	* effects may be similar but implementation-defined.
	*
	* <p>The ability to switch to a mode with minimal post proessing may be disabled by a user
	* setting in the system settings menu. In that case, this field is ignored and the display will
	* remain in its current mode.
	*
	* <p>Set from attribute {@link android.R.attr#preferMinimalPostProcessing}.
	*
	* @see android.view.WindowManager.LayoutParams#preferMinimalPostProcessing
	* @see android.view.Display#isMinimalPostProcessingSupported
	*/
	public boolean preferMinimalPostProcessing = MINIMAL_POST_PROCESSING_DEFAULT;

	/**		/**
	* Bit in {@link #flags} indicating whether this activity is able to		* Bit in {@link #flags} indicating whether this activity is able to
	* run in multiple processes. If		* run in multiple processes. If
	@@ -505,6 +468,13 @@ public class ActivityInfo extends ComponentInfo implements Parcelable {
	*/		*/
	public static final int FLAG_TURN_SCREEN_ON = 0x1000000;		public static final int FLAG_TURN_SCREEN_ON = 0x1000000;

			/**
			* Bit in {@link #flags} indicating whether the display should preferably be switched to a
			* minimal post processing mode.
			* See {@link android.R.attr#preferMinimalPostProcessing}
			*/
			public static final int FLAG_PREFER_MINIMAL_POST_PROCESSING = 0x2000000;

	/**		/**
	* @hide Bit in {@link #flags}: If set, this component will only be seen		* @hide Bit in {@link #flags}: If set, this component will only be seen
	* by the system user. Only works with broadcast receivers. Set from the		* by the system user. Only works with broadcast receivers. Set from the
	@@ -1041,7 +1011,6 @@ public class ActivityInfo extends ComponentInfo implements Parcelable {
	requestedVrComponent = orig.requestedVrComponent;		requestedVrComponent = orig.requestedVrComponent;
	rotationAnimation = orig.rotationAnimation;		rotationAnimation = orig.rotationAnimation;
	colorMode = orig.colorMode;		colorMode = orig.colorMode;
	preferMinimalPostProcessing = orig.preferMinimalPostProcessing;
	maxAspectRatio = orig.maxAspectRatio;		maxAspectRatio = orig.maxAspectRatio;
	minAspectRatio = orig.minAspectRatio;		minAspectRatio = orig.minAspectRatio;
	}		}
	@@ -1269,7 +1238,6 @@ public class ActivityInfo extends ComponentInfo implements Parcelable {
	dest.writeInt(colorMode);		dest.writeInt(colorMode);
	dest.writeFloat(maxAspectRatio);		dest.writeFloat(maxAspectRatio);
	dest.writeFloat(minAspectRatio);		dest.writeFloat(minAspectRatio);
	dest.writeBoolean(preferMinimalPostProcessing);
	}		}

	/**		/**
	@@ -1388,7 +1356,6 @@ public class ActivityInfo extends ComponentInfo implements Parcelable {
	colorMode = source.readInt();		colorMode = source.readInt();
	maxAspectRatio = source.readFloat();		maxAspectRatio = source.readFloat();
	minAspectRatio = source.readFloat();		minAspectRatio = source.readFloat();
	preferMinimalPostProcessing = source.readBoolean();
	}		}

	/**		/**

core/java/android/content/pm/PackageParser.java

+4 −4

core/java/android/content/pm/parsing/PackageInfoWithoutStateUtils.java

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -451,7 +451,6 @@ public class PackageInfoWithoutStateUtils {
	ai.requestedVrComponent = a.getRequestedVrComponent();		ai.requestedVrComponent = a.getRequestedVrComponent();
	ai.rotationAnimation = a.getRotationAnimation();		ai.rotationAnimation = a.getRotationAnimation();
	ai.colorMode = a.getColorMode();		ai.colorMode = a.getColorMode();
	ai.preferMinimalPostProcessing = a.isPreferMinimalPostProcessing();
	ai.windowLayout = a.getWindowLayout();		ai.windowLayout = a.getWindowLayout();
	ai.metaData = a.getMetaData();		ai.metaData = a.getMetaData();
	ai.applicationInfo = applicationInfo;		ai.applicationInfo = applicationInfo;

Original line number	Original line	Diff line number	Diff line
	@@ -4180,7 +4180,6 @@ public class PackageParser {
	a.info.directBootAware = false;		a.info.directBootAware = false;
	a.info.rotationAnimation = ROTATION_ANIMATION_UNSPECIFIED;		a.info.rotationAnimation = ROTATION_ANIMATION_UNSPECIFIED;
	a.info.colorMode = ActivityInfo.COLOR_MODE_DEFAULT;		a.info.colorMode = ActivityInfo.COLOR_MODE_DEFAULT;
	a.info.preferMinimalPostProcessing = ActivityInfo.MINIMAL_POST_PROCESSING_DEFAULT;
	if (hardwareAccelerated) {		if (hardwareAccelerated) {
	a.info.flags \|= ActivityInfo.FLAG_HARDWARE_ACCELERATED;		a.info.flags \|= ActivityInfo.FLAG_HARDWARE_ACCELERATED;
	}		}
	@@ -4395,9 +4394,10 @@ public class PackageParser {
	a.info.colorMode = sa.getInt(R.styleable.AndroidManifestActivity_colorMode,		a.info.colorMode = sa.getInt(R.styleable.AndroidManifestActivity_colorMode,
	ActivityInfo.COLOR_MODE_DEFAULT);		ActivityInfo.COLOR_MODE_DEFAULT);

	a.info.preferMinimalPostProcessing = sa.getBoolean(		if (sa.getBoolean(
	R.styleable.AndroidManifestActivity_preferMinimalPostProcessing,		R.styleable.AndroidManifestActivity_preferMinimalPostProcessing, false)) {
	ActivityInfo.MINIMAL_POST_PROCESSING_DEFAULT);		a.info.flags \|= ActivityInfo.FLAG_PREFER_MINIMAL_POST_PROCESSING;
			}

	if (sa.getBoolean(R.styleable.AndroidManifestActivity_showWhenLocked, false)) {		if (sa.getBoolean(R.styleable.AndroidManifestActivity_showWhenLocked, false)) {
	a.info.flags \|= ActivityInfo.FLAG_SHOW_WHEN_LOCKED;		a.info.flags \|= ActivityInfo.FLAG_SHOW_WHEN_LOCKED;