Skip to content

Commit 9da0f8a

Browse files
author
Fabrice Di Meglio
committed
Add View textAlignment
- fix bug #6163772 - use bits field and pack them as much as possible - take care of "supportsRtl" flag from Manifest - add visual unit tests CTS unit tests in another CL Change-Id: Ib77c4eb423854209af130688c5ef9977401a9c1c
1 parent 6756f74 commit 9da0f8a

File tree

11 files changed

+1658
-30
lines changed

11 files changed

+1658
-30
lines changed

api/current.txt

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -596,7 +596,7 @@ package android {
596596
field public static final int layerType = 16843604; // 0x1010354
597597
field public static final int layout = 16842994; // 0x10100f2
598598
field public static final int layoutAnimation = 16842988; // 0x10100ec
599-
field public static final int layoutDirection = 16843690; // 0x10103aa
599+
field public static final int layoutDirection = 16843691; // 0x10103ab
600600
field public static final int layout_above = 16843140; // 0x1010184
601601
field public static final int layout_alignBaseline = 16843142; // 0x1010186
602602
field public static final int layout_alignBottom = 16843146; // 0x101018a
@@ -618,10 +618,10 @@ package android {
618618
field public static final int layout_height = 16842997; // 0x10100f5
619619
field public static final int layout_margin = 16842998; // 0x10100f6
620620
field public static final int layout_marginBottom = 16843002; // 0x10100fa
621-
field public static final int layout_marginEnd = 16843694; // 0x10103ae
621+
field public static final int layout_marginEnd = 16843695; // 0x10103af
622622
field public static final int layout_marginLeft = 16842999; // 0x10100f7
623623
field public static final int layout_marginRight = 16843001; // 0x10100f9
624-
field public static final int layout_marginStart = 16843693; // 0x10103ad
624+
field public static final int layout_marginStart = 16843694; // 0x10103ae
625625
field public static final int layout_marginTop = 16843000; // 0x10100f8
626626
field public static final int layout_row = 16843643; // 0x101037b
627627
field public static final int layout_rowSpan = 16843644; // 0x101037c
@@ -717,10 +717,10 @@ package android {
717717
field public static final int packageNames = 16843649; // 0x1010381
718718
field public static final int padding = 16842965; // 0x10100d5
719719
field public static final int paddingBottom = 16842969; // 0x10100d9
720-
field public static final int paddingEnd = 16843692; // 0x10103ac
720+
field public static final int paddingEnd = 16843693; // 0x10103ad
721721
field public static final int paddingLeft = 16842966; // 0x10100d6
722722
field public static final int paddingRight = 16842968; // 0x10100d8
723-
field public static final int paddingStart = 16843691; // 0x10103ab
723+
field public static final int paddingStart = 16843692; // 0x10103ac
724724
field public static final int paddingTop = 16842967; // 0x10100d7
725725
field public static final int panelBackground = 16842846; // 0x101005e
726726
field public static final int panelColorBackground = 16842849; // 0x1010061
@@ -962,6 +962,7 @@ package android {
962962
field public static final int tension = 16843370; // 0x101026a
963963
field public static final int testOnly = 16843378; // 0x1010272
964964
field public static final int text = 16843087; // 0x101014f
965+
field public static final int textAlignment = 16843690; // 0x10103aa
965966
field public static final int textAllCaps = 16843660; // 0x101038c
966967
field public static final int textAppearance = 16842804; // 0x1010034
967968
field public static final int textAppearanceButton = 16843271; // 0x1010207
@@ -23209,6 +23210,7 @@ package android.view {
2320923210
method public void buildLayer();
2321023211
method public boolean callOnClick();
2321123212
method public boolean canResolveLayoutDirection();
23213+
method public boolean canResolveTextAlignment();
2321223214
method public boolean canResolveTextDirection();
2321323215
method public boolean canScrollHorizontally(int);
2321423216
method public boolean canScrollVertically(int);
@@ -23329,6 +23331,7 @@ package android.view {
2332923331
method public float getPivotY();
2333023332
method public int getResolvedLayoutDirection();
2333123333
method public int getResolvedLayoutDirection(android.graphics.drawable.Drawable);
23334+
method public int getResolvedTextAlignment();
2333223335
method public int getResolvedTextDirection();
2333323336
method public android.content.res.Resources getResources();
2333423337
method public final int getRight();
@@ -23349,6 +23352,7 @@ package android.view {
2334923352
method public int getSystemUiVisibility();
2335023353
method public java.lang.Object getTag();
2335123354
method public java.lang.Object getTag(int);
23355+
method public int getTextAlignment();
2335223356
method public int getTextDirection();
2335323357
method public final int getTop();
2335423358
method protected float getTopFadingEdgeStrength();
@@ -23456,6 +23460,8 @@ package android.view {
2345623460
method public void onPopulateAccessibilityEvent(android.view.accessibility.AccessibilityEvent);
2345723461
method public void onResolvedLayoutDirectionChanged();
2345823462
method public void onResolvedLayoutDirectionReset();
23463+
method public void onResolvedTextAlignmentChanged();
23464+
method public void onResolvedTextAlignmentReset();
2345923465
method public void onResolvedTextDirectionChanged();
2346023466
method public void onResolvedTextDirectionReset();
2346123467
method protected void onRestoreInstanceState(android.os.Parcelable);
@@ -23496,11 +23502,13 @@ package android.view {
2349623502
method public boolean requestRectangleOnScreen(android.graphics.Rect);
2349723503
method public boolean requestRectangleOnScreen(android.graphics.Rect, boolean);
2349823504
method public void resetResolvedLayoutDirection();
23505+
method public void resetResolvedTextAlignment();
2349923506
method public void resetResolvedTextDirection();
2350023507
method public void resolveLayoutDirection();
2350123508
method public void resolvePadding();
2350223509
method public static int resolveSize(int, int);
2350323510
method public static int resolveSizeAndState(int, int, int);
23511+
method public void resolveTextAlignment();
2350423512
method public void resolveTextDirection();
2350523513
method public void restoreHierarchyState(android.util.SparseArray<android.os.Parcelable>);
2350623514
method public void saveHierarchyState(android.util.SparseArray<android.os.Parcelable>);
@@ -23584,6 +23592,7 @@ package android.view {
2358423592
method public void setSystemUiVisibility(int);
2358523593
method public void setTag(java.lang.Object);
2358623594
method public void setTag(int, java.lang.Object);
23595+
method public void setTextAlignment(int);
2358723596
method public void setTextDirection(int);
2358823597
method public final void setTop(int);
2358923598
method public void setTouchDelegate(android.view.TouchDelegate);
@@ -23694,6 +23703,15 @@ package android.view {
2369423703
field public static final int SYSTEM_UI_FLAG_LOW_PROFILE = 1; // 0x1
2369523704
field public static final int SYSTEM_UI_FLAG_VISIBLE = 0; // 0x0
2369623705
field public static final int SYSTEM_UI_LAYOUT_FLAGS = 1536; // 0x600
23706+
field public static final int TEXT_ALIGNMENT_CENTER = 4; // 0x4
23707+
field protected static int TEXT_ALIGNMENT_DEFAULT;
23708+
field public static final int TEXT_ALIGNMENT_GRAVITY = 1; // 0x1
23709+
field public static final int TEXT_ALIGNMENT_INHERIT = 0; // 0x0
23710+
field public static final int TEXT_ALIGNMENT_RESOLVED_DEFAULT = 131072; // 0x20000
23711+
field public static final int TEXT_ALIGNMENT_TEXT_END = 3; // 0x3
23712+
field public static final int TEXT_ALIGNMENT_TEXT_START = 2; // 0x2
23713+
field public static final int TEXT_ALIGNMENT_VIEW_END = 6; // 0x6
23714+
field public static final int TEXT_ALIGNMENT_VIEW_START = 5; // 0x5
2369723715
field public static final int TEXT_DIRECTION_ANY_RTL = 2; // 0x2
2369823716
field protected static int TEXT_DIRECTION_DEFAULT;
2369923717
field public static final int TEXT_DIRECTION_FIRST_STRONG = 1; // 0x1

0 commit comments

Comments
 (0)