summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Roozbeh Pournader <roozbeh@google.com> 2015-07-20 22:08:16 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-07-20 22:08:16 +0000
commitedd2e67cf217de075ee7184e080e17859c72d523 (patch)
treefc079cfe2282b8e93f2203c2fb94622455e4a7fc
parentabe22377262a2aadbeb3b64d8bc10916b0256d6d (diff)
parent2dc20d7ab2bce9ff9e309b599424963711ece718 (diff)
am 2dc20d7a: am 293eca69: am 32f7527d: am 2dc6ebbe: Merge "Fix default value of stereoReset() in the documentation." into mnc-dev
* commit '2dc20d7ab2bce9ff9e309b599424963711ece718': Fix default value of stereoReset() in the documentation.
-rw-r--r--core/java/android/text/BidiFormatter.java15
1 files changed, 8 insertions, 7 deletions
diff --git a/core/java/android/text/BidiFormatter.java b/core/java/android/text/BidiFormatter.java
index 7ea9da1715c4..5c088cdd9d3a 100644
--- a/core/java/android/text/BidiFormatter.java
+++ b/core/java/android/text/BidiFormatter.java
@@ -173,7 +173,7 @@ public final class BidiFormatter {
/**
* Specifies whether the BidiFormatter to be built should also "reset" directionality before
- * a string being bidi-wrapped, not just after it. The default is false.
+ * a string being bidi-wrapped, not just after it. The default is true.
*/
public Builder stereoReset(boolean stereoReset) {
if (stereoReset) {
@@ -363,12 +363,13 @@ public final class BidiFormatter {
* If {@code isolate}, directionally isolates the string so that it does not garble its
* surroundings. Currently, this is done by "resetting" the directionality after the string by
* appending a trailing Unicode bidi mark matching the context directionality (LRM or RLM) when
- * either the overall directionality or the exit directionality of the string is opposite to that
- * of the context. If the formatter was built using {@link Builder#stereoReset(boolean)} and
- * passing "true" as an argument, also prepends a Unicode bidi mark matching the context
- * directionality when either the overall directionality or the entry directionality of the
- * string is opposite to that of the context. Note that as opposed to the overall
- * directionality, the entry and exit directionalities are determined from the string itself.
+ * either the overall directionality or the exit directionality of the string is opposite to
+ * that of the context. Unless the formatter was built using
+ * {@link Builder#stereoReset(boolean)} with a {@code false} argument, also prepends a Unicode
+ * bidi mark matching the context directionality when either the overall directionality or the
+ * entry directionality of the string is opposite to that of the context. Note that as opposed
+ * to the overall directionality, the entry and exit directionalities are determined from the
+ * string itself.
* <p>
* Does *not* do HTML-escaping.
*