Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix bug #5199577 TextView with android:password="true" is showing the "dots" on the left even if the password chars are RTL"

Browse Source
This commit is contained in:
Fabrice Di Meglio
2011-08-26 14:05:09 -07:00
committed by Android (Google) Code Review
parent 2589c93733 7810b5f8cf
commit d32f27aec0
7 changed files with 56 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/android/content/res/Configuration.java
View File

@@ -345,7 +345,6 @@ public final class Configuration implements Parcelable, Comparable<Configuration
sb.append(" (no locale)");
}
switch (textLayoutDirection) {
case LocaleUtil.TEXT_LAYOUT_DIRECTION_UNDEFINED_DO_NOT_USE: sb.append(" ?layoutdir"); break;
case LocaleUtil.TEXT_LAYOUT_DIRECTION_RTL_DO_NOT_USE: sb.append(" rtl"); break;
default: sb.append(" layoutdir="); sb.append(textLayoutDirection); break;
}

28
core/java/android/text/TextDirectionHeuristics.java
View File

@@ -17,6 +17,10 @@
package android.text;
import java.util.Locale;
import android.util.LocaleUtil;
/**
* Some objects that implement TextDirectionHeuristic.
* @hide
@@ -75,6 +79,11 @@ public class TextDirectionHeuristics {
public static final TextDirectionHeuristic CHARCOUNT_RTL =
new TextDirectionHeuristicInternal(CharCount.INSTANCE_DEFAULT, true);
/**
* Force the paragraph direction to the Locale direction. Falls back to left to right.
*/
public static final TextDirectionHeuristic LOCALE = TextDirectionHeuristicLocale.INSTANCE;
private static enum TriState {
TRUE, FALSE, UNKNOWN;
}
@@ -300,4 +309,23 @@ public class TextDirectionHeuristics {
public static final float DEFAULT_THRESHOLD = 0.6f;
public static final CharCount INSTANCE_DEFAULT = new CharCount(DEFAULT_THRESHOLD);
}
/**
* Algorithm that uses the Locale direction to force the direction of a paragraph.
*/
public static class TextDirectionHeuristicLocale extends TextDirectionHeuristicImpl {
public TextDirectionHeuristicLocale() {
super(null);
}
@Override
protected boolean defaultIsRtl() {
final int dir = LocaleUtil.getLayoutDirectionFromLocale(java.util.Locale.getDefault());
return (dir == LocaleUtil.TEXT_LAYOUT_DIRECTION_RTL_DO_NOT_USE);
}
public static final TextDirectionHeuristicLocale INSTANCE =
new TextDirectionHeuristicLocale();
}
}

30
core/java/android/util/LocaleUtil.java
View File

@@ -29,11 +29,6 @@ public class LocaleUtil {
private LocaleUtil() { /* cannot be instantiated */ }
/**
* @hide Do not use. Implementation not finished.
*/
public static final int TEXT_LAYOUT_DIRECTION_UNDEFINED_DO_NOT_USE = -1;
/**
* @hide Do not use. Implementation not finished.
*/
@@ -54,7 +49,6 @@ public class LocaleUtil {
*
* @param locale the Locale for which we want the layout direction. Can be null.
* @return the layout direction. This may be one of:
* {@link #TEXT_LAYOUT_DIRECTION_UNDEFINED_DO_NOT_USE} or
* {@link #TEXT_LAYOUT_DIRECTION_LTR_DO_NOT_USE} or
* {@link #TEXT_LAYOUT_DIRECTION_RTL_DO_NOT_USE}.
*
@@ -63,17 +57,16 @@ public class LocaleUtil {
* @hide
*/
public static int getLayoutDirectionFromLocale(Locale locale) {
if (locale == null || locale.equals(Locale.ROOT)) {
return TEXT_LAYOUT_DIRECTION_UNDEFINED_DO_NOT_USE;
if (locale != null && !locale.equals(Locale.ROOT)) {
final String scriptSubtag = ICU.getScript(ICU.addLikelySubtags(locale.toString()));
if (scriptSubtag == null) return getLayoutDirectionFromFirstChar(locale);
if (scriptSubtag.equalsIgnoreCase(ARAB_SCRIPT_SUBTAG) ||
scriptSubtag.equalsIgnoreCase(HEBR_SCRIPT_SUBTAG)) {
return TEXT_LAYOUT_DIRECTION_RTL_DO_NOT_USE;
}
}
final String scriptSubtag = ICU.getScript(ICU.addLikelySubtags(locale.toString()));
if (scriptSubtag == null) return getLayoutDirectionFromFirstChar(locale);
if (scriptSubtag.equalsIgnoreCase(ARAB_SCRIPT_SUBTAG) ||
scriptSubtag.equalsIgnoreCase(HEBR_SCRIPT_SUBTAG)) {
return TEXT_LAYOUT_DIRECTION_RTL_DO_NOT_USE;
}
return TEXT_LAYOUT_DIRECTION_LTR_DO_NOT_USE;
}
@@ -84,7 +77,6 @@ public class LocaleUtil {
*
* @param locale
* @return the layout direction. This may be one of:
* {@link #TEXT_LAYOUT_DIRECTION_UNDEFINED_DO_NOT_USE} or
* {@link #TEXT_LAYOUT_DIRECTION_LTR_DO_NOT_USE} or
* {@link #TEXT_LAYOUT_DIRECTION_RTL_DO_NOT_USE}.
*
@@ -94,13 +86,13 @@ public class LocaleUtil {
*/
private static int getLayoutDirectionFromFirstChar(Locale locale) {
switch(Character.getDirectionality(locale.getDisplayName(locale).charAt(0))) {
case Character.DIRECTIONALITY_LEFT_TO_RIGHT:
return TEXT_LAYOUT_DIRECTION_LTR_DO_NOT_USE;
case Character.DIRECTIONALITY_RIGHT_TO_LEFT:
case Character.DIRECTIONALITY_RIGHT_TO_LEFT_ARABIC:
return TEXT_LAYOUT_DIRECTION_RTL_DO_NOT_USE;
case Character.DIRECTIONALITY_LEFT_TO_RIGHT:
default:
return TEXT_LAYOUT_DIRECTION_UNDEFINED_DO_NOT_USE;
return TEXT_LAYOUT_DIRECTION_LTR_DO_NOT_USE;
}
}
}

5
core/java/android/widget/TextView.java
View File

@@ -10886,6 +10886,11 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
@Override
protected void resolveTextDirection() {
if (hasPasswordTransformationMethod()) {
mTextDir = TextDirectionHeuristics.LOCALE;
return;
}
// Always need to resolve layout direction first
final boolean defaultIsRtl = (getResolvedLayoutDirection() == LAYOUT_DIRECTION_RTL);

5
core/tests/coretests/src/android/util/LocaleUtilTest.java
View File

@@ -23,7 +23,6 @@ import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetNew;
import static android.util.LocaleUtil.TEXT_LAYOUT_DIRECTION_LTR_DO_NOT_USE;
import static android.util.LocaleUtil.TEXT_LAYOUT_DIRECTION_UNDEFINED_DO_NOT_USE;
public class LocaleUtilTest extends AndroidTestCase {
@@ -33,7 +32,7 @@ public class LocaleUtilTest extends AndroidTestCase {
args = {Locale.class}
)
public void testGetLayoutDirectionFromLocale() {
assertEquals(TEXT_LAYOUT_DIRECTION_UNDEFINED_DO_NOT_USE,
assertEquals(TEXT_LAYOUT_DIRECTION_LTR_DO_NOT_USE,
LocaleUtil.getLayoutDirectionFromLocale(null));
assertEquals(TEXT_LAYOUT_DIRECTION_LTR_DO_NOT_USE,
@@ -59,7 +58,7 @@ public class LocaleUtilTest extends AndroidTestCase {
assertEquals(LocaleUtil.TEXT_LAYOUT_DIRECTION_LTR_DO_NOT_USE,
LocaleUtil.getLayoutDirectionFromLocale(Locale.US));
assertEquals(LocaleUtil.TEXT_LAYOUT_DIRECTION_UNDEFINED_DO_NOT_USE,
assertEquals(LocaleUtil.TEXT_LAYOUT_DIRECTION_LTR_DO_NOT_USE,
LocaleUtil.getLayoutDirectionFromLocale(Locale.ROOT));
assertEquals(LocaleUtil.TEXT_LAYOUT_DIRECTION_LTR_DO_NOT_USE,

11
tests/BiDiTests/res/layout/basic.xml
View File

@@ -27,11 +27,18 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
<Button android:id="@+id/button"
<TextView android:id="@+id/textview_password_default"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/button_text"
android:textSize="32dip"
android:text="@string/textview_password_default_text"
/>
<EditText android:id="@+id/edittext_password_default"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:textSize="32dip"
android:password="true"
/>
<TextView android:id="@+id/textview_default"

1
tests/BiDiTests/res/values/strings.xml
View File

@@ -28,6 +28,7 @@
<string name="textview_ltr_text">This is a text for a LTR TextView</string>
<string name="textview_rtl_text">This is a text for a RTL TextView</string>
<string name="textview_default_text">This is a text for a default TextView</string>
<string name="textview_password_default_text">This is a text for a password TextView</string>
<string name="edittext_text">mmmmmmmmmmmmmmmmmmmmmmmm</string>
<string name="normal_text">Normal String</string>
<string name="normal_long_text">mmmmmmmmmmmmmmmmmmmmmmmm</string>