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

Merge "Force direction of phone number fields to (practically) LTR" into oc-dev

Browse Source
This commit is contained in:
Roozbeh Pournader
2017-04-06 21:13:01 +00:00
committed by Android (Google) Code Review
parent 11d1a392f2 380154724b
commit 0dc7596ee3
1 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,6 +57,7 @@ import android.graphics.RectF;
import android.graphics.Typeface; import android.graphics.Typeface;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.graphics.fonts.FontVariationAxis; import android.graphics.fonts.FontVariationAxis;
import android.icu.text.DecimalFormatSymbols;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.os.Bundle; import android.os.Bundle;
import android.os.LocaleList; import android.os.LocaleList;
@@ -11058,6 +11059,26 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
return TextDirectionHeuristics.LTR; return TextDirectionHeuristics.LTR;
} }
if (mEditor != null
&& (mEditor.mInputType & EditorInfo.TYPE_MASK_CLASS)
== EditorInfo.TYPE_CLASS_PHONE) {
// Phone numbers must be in the direction of the locale's digits. Most locales have LTR
// digits, but some locales, such as those written in the Adlam or N'Ko scripts, have
// RTL digits.
final DecimalFormatSymbols symbols = DecimalFormatSymbols.getInstance(getTextLocale());
final String zero = symbols.getDigitStrings()[0];
// In case the zero digit is multi-codepoint, just use the first codepoint to determine
// direction.
final int firstCodepoint = zero.codePointAt(0);
final byte digitDirection = Character.getDirectionality(firstCodepoint);
if (digitDirection == Character.DIRECTIONALITY_RIGHT_TO_LEFT
|| digitDirection == Character.DIRECTIONALITY_RIGHT_TO_LEFT_ARABIC) {
return TextDirectionHeuristics.RTL;
} else {
return TextDirectionHeuristics.LTR;
}
}
// Always need to resolve layout direction first // Always need to resolve layout direction first
final boolean defaultIsRtl = (getLayoutDirection() == LAYOUT_DIRECTION_RTL); final boolean defaultIsRtl = (getLayoutDirection() == LAYOUT_DIRECTION_RTL);