doc change: fix broken R.styleable formatting (caused by missing periods). Adjust table markup. (59ad275e) · Commits · e / os / android_frameworks_base

core/res/res/values/attrs.xml

+120 −108

File changed.

Preview size limit exceeded, changes collapsed.

core/res/res/values/attrs_manifest.xml

+12 −12

Original line number	Original line	Diff line number	Diff line
	@@ -661,7 +661,7 @@
	for normal behavior. -->		for normal behavior. -->
	<attr name="hasCode" format="boolean" />		<attr name="hasCode" format="boolean" />
	<attr name="persistent" />		<attr name="persistent" />
	<!-- Specify whether the components in this application are enabled or not (i.e. can be		<!-- Specify whether the components in this application are enabled or not (that is, can be
	instantiated by the system).		instantiated by the system).
	If "false", it overrides any component specific values (a value of "true" will not		If "false", it overrides any component specific values (a value of "true" will not
	override the component specific values). -->		override the component specific values). -->
	@@ -929,7 +929,7 @@
	<declare-styleable name="AndroidManifestProvider" parent="AndroidManifestApplication">		<declare-styleable name="AndroidManifestProvider" parent="AndroidManifestApplication">
	<!-- Required name of the class implementing the provider, deriving from		<!-- Required name of the class implementing the provider, deriving from
	{@link android.content.ContentProvider}. This is a fully		{@link android.content.ContentProvider}. This is a fully
	qualified class name (i.e., com.mycompany.myapp.MyProvider); as a		qualified class name (for example, com.mycompany.myapp.MyProvider); as a
	short-hand if the first character of the class		short-hand if the first character of the class
	is a period then it is appended to your package name. -->		is a period then it is appended to your package name. -->
	<attr name="name" />		<attr name="name" />
	@@ -944,7 +944,7 @@
	<attr name="permission" />		<attr name="permission" />
	<attr name="multiprocess" />		<attr name="multiprocess" />
	<attr name="initOrder" />		<attr name="initOrder" />
	<!-- Specify whether this provider is enabled or not (i.e. can be instantiated by the system).		<!-- Specify whether this provider is enabled or not (that is, can be instantiated by the system).
	It can also be specified for an application as a whole, in which case a value of "false"		It can also be specified for an application as a whole, in which case a value of "false"
	will override any component specific values (a value of "true" will not override the		will override any component specific values (a value of "true" will not override the
	component specific values). -->		component specific values). -->
	@@ -1007,7 +1007,7 @@
	<declare-styleable name="AndroidManifestService" parent="AndroidManifestApplication">		<declare-styleable name="AndroidManifestService" parent="AndroidManifestApplication">
	<!-- Required name of the class implementing the service, deriving from		<!-- Required name of the class implementing the service, deriving from
	{@link android.app.Service}. This is a fully		{@link android.app.Service}. This is a fully
	qualified class name (i.e., com.mycompany.myapp.MyService); as a		qualified class name (for example, com.mycompany.myapp.MyService); as a
	short-hand if the first character of the class		short-hand if the first character of the class
	is a period then it is appended to your package name. -->		is a period then it is appended to your package name. -->
	<attr name="name" />		<attr name="name" />
	@@ -1015,7 +1015,7 @@
	<attr name="icon" />		<attr name="icon" />
	<attr name="permission" />		<attr name="permission" />
	<attr name="process" />		<attr name="process" />
	<!-- Specify whether the service is enabled or not (i.e. can be instantiated by the system).		<!-- Specify whether the service is enabled or not (that is, can be instantiated by the system).
	It can also be specified for an application as a whole, in which case a value of "false"		It can also be specified for an application as a whole, in which case a value of "false"
	will override any component specific values (a value of "true" will not override the		will override any component specific values (a value of "true" will not override the
	component specific values). -->		component specific values). -->
	@@ -1038,7 +1038,7 @@
	<declare-styleable name="AndroidManifestReceiver" parent="AndroidManifestApplication">		<declare-styleable name="AndroidManifestReceiver" parent="AndroidManifestApplication">
	<!-- Required name of the class implementing the receiver, deriving from		<!-- Required name of the class implementing the receiver, deriving from
	{@link android.content.BroadcastReceiver}. This is a fully		{@link android.content.BroadcastReceiver}. This is a fully
	qualified class name (i.e., com.mycompany.myapp.MyReceiver); as a		qualified class name (for example, com.mycompany.myapp.MyReceiver); as a
	short-hand if the first character of the class		short-hand if the first character of the class
	is a period then it is appended to your package name. -->		is a period then it is appended to your package name. -->
	<attr name="name" />		<attr name="name" />
	@@ -1046,7 +1046,7 @@
	<attr name="icon" />		<attr name="icon" />
	<attr name="permission" />		<attr name="permission" />
	<attr name="process" />		<attr name="process" />
	<!-- Specify whether the receiver is enabled or not (i.e. can be instantiated by the system).		<!-- Specify whether the receiver is enabled or not (that is, can be instantiated by the system).
	It can also be specified for an application as a whole, in which case a value of "false"		It can also be specified for an application as a whole, in which case a value of "false"
	will override any component specific values (a value of "true" will not override the		will override any component specific values (a value of "true" will not override the
	component specific values). -->		component specific values). -->
	@@ -1068,7 +1068,7 @@
	<declare-styleable name="AndroidManifestActivity" parent="AndroidManifestApplication">		<declare-styleable name="AndroidManifestActivity" parent="AndroidManifestApplication">
	<!-- Required name of the class implementing the activity, deriving from		<!-- Required name of the class implementing the activity, deriving from
	{@link android.app.Activity}. This is a fully		{@link android.app.Activity}. This is a fully
	qualified class name (i.e., com.mycompany.myapp.MyActivity); as a		qualified class name (for example, com.mycompany.myapp.MyActivity); as a
	short-hand if the first character of the class		short-hand if the first character of the class
	is a period then it is appended to your package name. -->		is a period then it is appended to your package name. -->
	<attr name="name" />		<attr name="name" />
	@@ -1090,7 +1090,7 @@
	<attr name="alwaysRetainTaskState" />		<attr name="alwaysRetainTaskState" />
	<attr name="stateNotNeeded" />		<attr name="stateNotNeeded" />
	<attr name="excludeFromRecents" />		<attr name="excludeFromRecents" />
	<!-- Specify whether the activity is enabled or not (i.e. can be instantiated by the system).		<!-- Specify whether the activity is enabled or not (that is, can be instantiated by the system).
	It can also be specified for an application as a whole, in which case a value of "false"		It can also be specified for an application as a whole, in which case a value of "false"
	will override any component specific values (a value of "true" will not override the		will override any component specific values (a value of "true" will not override the
	component specific values). -->		component specific values). -->
	@@ -1115,7 +1115,7 @@
	<declare-styleable name="AndroidManifestActivityAlias" parent="AndroidManifestApplication">		<declare-styleable name="AndroidManifestActivityAlias" parent="AndroidManifestApplication">
	<!-- Required name of the class implementing the activity, deriving from		<!-- Required name of the class implementing the activity, deriving from
	{@link android.app.Activity}. This is a fully		{@link android.app.Activity}. This is a fully
	qualified class name (i.e., com.mycompany.myapp.MyActivity); as a		qualified class name (for example, com.mycompany.myapp.MyActivity); as a
	short-hand if the first character of the class		short-hand if the first character of the class
	is a period then it is appended to your package name. -->		is a period then it is appended to your package name. -->
	<attr name="name" />		<attr name="name" />
	@@ -1128,7 +1128,7 @@
	<attr name="label" />		<attr name="label" />
	<attr name="icon" />		<attr name="icon" />
	<attr name="permission" />		<attr name="permission" />
	<!-- Specify whether the activity-alias is enabled or not (i.e. can be instantiated by the system).		<!-- Specify whether the activity-alias is enabled or not (that is, can be instantiated by the system).
	It can also be specified for an application as a whole, in which case a value of "false"		It can also be specified for an application as a whole, in which case a value of "false"
	will override any component specific values (a value of "true" will not override the		will override any component specific values (a value of "true" will not override the
	component specific values). -->		component specific values). -->
	@@ -1295,7 +1295,7 @@
	<declare-styleable name="AndroidManifestInstrumentation" parent="AndroidManifest">		<declare-styleable name="AndroidManifestInstrumentation" parent="AndroidManifest">
	<!-- Required name of the class implementing the instrumentation, deriving from		<!-- Required name of the class implementing the instrumentation, deriving from
	{@link android.app.Instrumentation}. This is a fully		{@link android.app.Instrumentation}. This is a fully
	qualified class name (i.e., com.mycompany.myapp.MyActivity); as a		qualified class name (for example, com.mycompany.myapp.MyActivity); as a
	short-hand if the first character of the class		short-hand if the first character of the class
	is a period then it is appended to your package name. -->		is a period then it is appended to your package name. -->
	<attr name="name" />		<attr name="name" />

tools/aapt/Resource.cpp

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -1285,10 +1285,10 @@ static status_t writeLayoutClasses(
	hasTable = true;		hasTable = true;
	fprintf(fp,		fprintf(fp,
	"%s <p>Includes the following attributes:</p>\n"		"%s <p>Includes the following attributes:</p>\n"
	"%s <table border=\"2\" width=\"85%%\" align=\"center\" frame=\"hsides\" rules=\"all\" cellpadding=\"5\">\n"		"%s <table>\n"
	"%s <colgroup align=\"left\" />\n"		"%s <colgroup align=\"left\" />\n"
	"%s <colgroup align=\"left\" />\n"		"%s <colgroup align=\"left\" />\n"
	"%s <tr><th>Attribute<th>Summary</tr>\n",		"%s <tr><th>Attribute</th><th>Description</th></tr>\n",
	indentStr,		indentStr,
	indentStr,		indentStr,
	indentStr,		indentStr,
	@@ -1322,7 +1322,7 @@ static status_t writeLayoutClasses(
	}		}
	String16 name(name8);		String16 name(name8);
	fixupSymbol(&name);		fixupSymbol(&name);
	fprintf(fp, "%s <tr><th><code>{@link #%s_%s %s:%s}</code><td>%s</tr>\n",		fprintf(fp, "%s <tr><td><code>{@link #%s_%s %s:%s}</code></td><td>%s</td></tr>\n",
	indentStr, nclassName.string(),		indentStr, nclassName.string(),
	String8(name).string(),		String8(name).string(),
	assets->getPackage().string(),		assets->getPackage().string(),

tools/aapt/ResourceTable.cpp

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -480,22 +480,22 @@ static status_t compileAttribute(const sp<AaptFile>& in,
	enumOrFlagsComment.append((attr.type&ResTable_map::TYPE_ENUM)		enumOrFlagsComment.append((attr.type&ResTable_map::TYPE_ENUM)
	? String16(" be one of the following constant values.")		? String16(" be one of the following constant values.")
	: String16(" be one or more (separated by '\|') of the following constant values."));		: String16(" be one or more (separated by '\|') of the following constant values."));
	enumOrFlagsComment.append(String16("</p>\n<table border=\"2\" width=\"85%\" align=\"center\" frame=\"hsides\" rules=\"all\" cellpadding=\"5\">\n"		enumOrFlagsComment.append(String16("</p>\n<table>\n"
	"<colgroup align=\"left\" />\n"		"<colgroup align=\"left\" />\n"
	"<colgroup align=\"left\" />\n"		"<colgroup align=\"left\" />\n"
	"<colgroup align=\"left\" />\n"		"<colgroup align=\"left\" />\n"
	"<tr><th>Constant<th>Value<th>Description</tr>"));		"<tr><th>Constant</th><th>Value</th><th>Description</th></tr>"));
	}		}

	enumOrFlagsComment.append(String16("\n<tr><th><code>"));		enumOrFlagsComment.append(String16("\n<tr><td><code>"));
	enumOrFlagsComment.append(itemIdent);		enumOrFlagsComment.append(itemIdent);
	enumOrFlagsComment.append(String16("</code><td>"));		enumOrFlagsComment.append(String16("</code></td><td>"));
	enumOrFlagsComment.append(value);		enumOrFlagsComment.append(value);
	enumOrFlagsComment.append(String16("<td>"));		enumOrFlagsComment.append(String16("</td><td>"));
	if (block.getComment(&len)) {		if (block.getComment(&len)) {
	enumOrFlagsComment.append(String16(block.getComment(&len)));		enumOrFlagsComment.append(String16(block.getComment(&len)));
	}		}
	enumOrFlagsComment.append(String16("</tr>"));		enumOrFlagsComment.append(String16("</td></tr>"));

	err = outTable->addBag(SourcePos(in->getPrintableSource(), block.getLineNumber()),		err = outTable->addBag(SourcePos(in->getPrintableSource(), block.getLineNumber()),
	myPackage,		myPackage,