Implement issue #3116702: New manifest tags for supported screen sizes DO NOT MERGE (a6d9c7c0) · Commits · e / os / android_frameworks_base

api/current.xml

+33 −0

Original line number	Original line	Diff line number	Diff line
	@@ -6961,6 +6961,17 @@
	visibility="public"		visibility="public"
	>		>
	</field>		</field>
			<field name="screenDensity"
			type="int"
			transient="false"
			volatile="false"
			value="16843467"
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
	<field name="screenOrientation"		<field name="screenOrientation"
	type="int"		type="int"
	transient="false"		transient="false"
	@@ -6972,6 +6983,17 @@
	visibility="public"		visibility="public"
	>		>
	</field>		</field>
			<field name="screenSize"
			type="int"
			transient="false"
			volatile="false"
			value="16843466"
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
	<field name="scrollHorizontally"		<field name="scrollHorizontally"
	type="int"		type="int"
	transient="false"		transient="false"
	@@ -172683,6 +172705,17 @@
	visibility="public"		visibility="public"
	>		>
	</field>		</field>
			<field name="DENSITY_XHIGH"
			type="int"
			transient="false"
			volatile="false"
			value="320"
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
	<field name="density"		<field name="density"
	type="float"		type="float"
	transient="false"		transient="false"

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

+10 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1080,6 +1080,16 @@ public class PackageParser {

	XmlUtils.skipCurrentTag(parser);		XmlUtils.skipCurrentTag(parser);

			} else if (tagName.equals("uses-gl-texture")) {
			// Just skip this tag
			XmlUtils.skipCurrentTag(parser);
			continue;

			} else if (tagName.equals("compatible-screens")) {
			// Just skip this tag
			XmlUtils.skipCurrentTag(parser);
			continue;

	} else if (tagName.equals("eat-comment")) {		} else if (tagName.equals("eat-comment")) {
	// Just skip this tag		// Just skip this tag
	XmlUtils.skipCurrentTag(parser);		XmlUtils.skipCurrentTag(parser);

core/java/android/util/DisplayMetrics.java

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -44,6 +44,11 @@ public class DisplayMetrics {
	*/		*/
	public static final int DENSITY_HIGH = 240;		public static final int DENSITY_HIGH = 240;

			/**
			* Standard quantized DPI for extra-high-density screens.
			*/
			public static final int DENSITY_XHIGH = 320;

	/**		/**
	* The reference density used throughout the system.		* The reference density used throughout the system.
	*/		*/

core/res/res/values/attrs_manifest.xml

+32 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1425,6 +1425,38 @@
	<attr name="functionalTest" />		<attr name="functionalTest" />
	</declare-styleable>		</declare-styleable>

			<!-- Attributes that can be supplied in an AndroidManifest.xml
			<code>screen</code> tag, a child of <code>compatible-screens</code>,
			which is itseld a child of the root
			{@link #AndroidManifest manifest} tag. -->
			<declare-styleable name="AndroidManifestCompatibleScreensScreen">
			<!-- Specifies a compatible screen size, as per the device
			configuration screen size bins. -->
			<attr name="screenSize">
			<!-- A small screen configuration, at least 240x320db. -->
			<enum name="small" value="200" />
			<!-- A normal screen configuration, at least 320x480db. -->
			<enum name="normal" value="300" />
			<!-- A large screen configuration, at least 400x530db. -->
			<enum name="large" value="400" />
			<!-- An extra large screen configuration, at least 600x800db. -->
			<enum name="xlarge" value="500" />
			</attr>
			<!-- Specifies a compatible screen density, as per the device
			configuration screen density bins. -->
			<attr name="screenDensity" format="integer">
			<!-- A low density screen, approximately 120dpi. -->
			<enum name="ldpi" value="120" />
			<!-- A medium density screen, approximately 160dpi. -->
			<enum name="mdpi" value="160" />
			<!-- A high density screen, approximately 240dpi. -->
			<enum name="hdpi" value="240" />
			<!-- An extra high density screen, approximately 320dpi. -->
			<enum name="xhdpi" value="320" />
			</attr>
			</declare-styleable>


	<!-- Declaration of an {@link android.content.Intent} object in XML. May		<!-- Declaration of an {@link android.content.Intent} object in XML. May
	also include zero or more {@link #IntentCategory <category> and		also include zero or more {@link #IntentCategory <category> and
	{@link #Extra <extra>} tags. -->		{@link #Extra <extra>} tags. -->

core/res/res/values/public.xml

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1260,6 +1260,8 @@
	<public type="attr" name="textSelectHandle" id="0x010102c7" />		<public type="attr" name="textSelectHandle" id="0x010102c7" />
	<public type="attr" name="textSelectHandleWindowStyle" id="0x010102c8" />		<public type="attr" name="textSelectHandleWindowStyle" id="0x010102c8" />
	<public type="attr" name="popupAnimationStyle" id="0x010102c9" />		<public type="attr" name="popupAnimationStyle" id="0x010102c9" />
			<public type="attr" name="screenSize" id="0x010102ca" />
			<public type="attr" name="screenDensity" id="0x010102cb" />

	<!-- presence drawables for videochat or audiochat capable contacts -->		<!-- presence drawables for videochat or audiochat capable contacts -->
	<public type="drawable" name="presence_video_away" id="0x010800ac" />		<public type="drawable" name="presence_video_away" id="0x010800ac" />