am 5043dc20: am bf8a663c: am 3f7a4990: Merge "Improve the Resource.getQuantityString/getQuantityText documentation."

* commit '5043dc20633a05c429de3ae469dc7d74bfb92451':
  Improve the Resource.getQuantityString/getQuantityText documentation.
This commit is contained in:
Elliott Hughes
2013-03-08 22:51:09 +00:00
committed by Android Git Automerger

View File

@ -233,11 +233,13 @@ public class Resources {
}
/**
* Return the character sequence associated with a particular resource ID for a particular
* numerical quantity.
*
* <p>See <a href="{@docRoot}guide/topics/resources/string-resource.html#Plurals">String
* Resources</a> for more on quantity strings.
* Returns the character sequence necessary for grammatically correct pluralization
* of the given resource ID for the given quantity.
* Note that the character sequence is selected based solely on grammatical necessity,
* and that such rules differ between languages. Do not assume you know which string
* will be returned for a given quantity. See
* <a href="{@docRoot}guide/topics/resources/string-resource.html#Plurals">String Resources</a>
* for more detail.
*
* @param id The desired resource identifier, as generated by the aapt
* tool. This integer encodes the package, type, and resource
@ -345,14 +347,17 @@ public class Resources {
}
/**
* Return the string value associated with a particular resource ID for a particular
* numerical quantity, substituting the format arguments as defined in
* {@link java.util.Formatter} and {@link java.lang.String#format}. It will be
* stripped of any styled text information.
* {@more}
* Formats the string necessary for grammatically correct pluralization
* of the given resource ID for the given quantity, using the given arguments.
* Note that the string is selected based solely on grammatical necessity,
* and that such rules differ between languages. Do not assume you know which string
* will be returned for a given quantity. See
* <a href="{@docRoot}guide/topics/resources/string-resource.html#Plurals">String Resources</a>
* for more detail.
*
* <p>See <a href="{@docRoot}guide/topics/resources/string-resource.html#Plurals">String
* Resources</a> for more on quantity strings.
* <p>Substitution of format arguments works as if using
* {@link java.util.Formatter} and {@link java.lang.String#format}.
* The resulting string will be stripped of any styled text information.
*
* @param id The desired resource identifier, as generated by the aapt
* tool. This integer encodes the package, type, and resource
@ -373,11 +378,13 @@ public class Resources {
}
/**
* Return the string value associated with a particular resource ID for a particular
* numerical quantity.
*
* <p>See <a href="{@docRoot}guide/topics/resources/string-resource.html#Plurals">String
* Resources</a> for more on quantity strings.
* Returns the string necessary for grammatically correct pluralization
* of the given resource ID for the given quantity.
* Note that the string is selected based solely on grammatical necessity,
* and that such rules differ between languages. Do not assume you know which string
* will be returned for a given quantity. See
* <a href="{@docRoot}guide/topics/resources/string-resource.html#Plurals">String Resources</a>
* for more detail.
*
* @param id The desired resource identifier, as generated by the aapt
* tool. This integer encodes the package, type, and resource