Skip to content

Commit 72898e9

Browse files
author
Fabrice Di Meglio
committed
FIx bug #7414801 Should make private and final View.TEXT_DIRECTION_DEFAULT and View.TEXT_ALIGNMENT_DEFAULT constants
- made them private and final - fixed comment Change-Id: Ia1d22329edb7ac26e7bcd0489770a99ad41c4f0e
1 parent f704e9f commit 72898e9

File tree

3 files changed

+3
-8
lines changed

3 files changed

+3
-8
lines changed

api/17.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25364,15 +25364,13 @@ package android.view {
2536425364
field public static final int SYSTEM_UI_FLAG_VISIBLE = 0; // 0x0
2536525365
field public static final int SYSTEM_UI_LAYOUT_FLAGS = 1536; // 0x600
2536625366
field public static final int TEXT_ALIGNMENT_CENTER = 4; // 0x4
25367-
field public static int TEXT_ALIGNMENT_DEFAULT;
2536825367
field public static final int TEXT_ALIGNMENT_GRAVITY = 1; // 0x1
2536925368
field public static final int TEXT_ALIGNMENT_INHERIT = 0; // 0x0
2537025369
field public static final int TEXT_ALIGNMENT_TEXT_END = 3; // 0x3
2537125370
field public static final int TEXT_ALIGNMENT_TEXT_START = 2; // 0x2
2537225371
field public static final int TEXT_ALIGNMENT_VIEW_END = 6; // 0x6
2537325372
field public static final int TEXT_ALIGNMENT_VIEW_START = 5; // 0x5
2537425373
field public static final int TEXT_DIRECTION_ANY_RTL = 2; // 0x2
25375-
field public static int TEXT_DIRECTION_DEFAULT;
2537625374
field public static final int TEXT_DIRECTION_FIRST_STRONG = 1; // 0x1
2537725375
field public static final int TEXT_DIRECTION_INHERIT = 0; // 0x0
2537825376
field public static final int TEXT_DIRECTION_LOCALE = 5; // 0x5

api/current.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25364,15 +25364,13 @@ package android.view {
2536425364
field public static final int SYSTEM_UI_FLAG_VISIBLE = 0; // 0x0
2536525365
field public static final int SYSTEM_UI_LAYOUT_FLAGS = 1536; // 0x600
2536625366
field public static final int TEXT_ALIGNMENT_CENTER = 4; // 0x4
25367-
field public static int TEXT_ALIGNMENT_DEFAULT;
2536825367
field public static final int TEXT_ALIGNMENT_GRAVITY = 1; // 0x1
2536925368
field public static final int TEXT_ALIGNMENT_INHERIT = 0; // 0x0
2537025369
field public static final int TEXT_ALIGNMENT_TEXT_END = 3; // 0x3
2537125370
field public static final int TEXT_ALIGNMENT_TEXT_START = 2; // 0x2
2537225371
field public static final int TEXT_ALIGNMENT_VIEW_END = 6; // 0x6
2537325372
field public static final int TEXT_ALIGNMENT_VIEW_START = 5; // 0x5
2537425373
field public static final int TEXT_DIRECTION_ANY_RTL = 2; // 0x2
25375-
field public static int TEXT_DIRECTION_DEFAULT;
2537625374
field public static final int TEXT_DIRECTION_FIRST_STRONG = 1; // 0x1
2537725375
field public static final int TEXT_DIRECTION_INHERIT = 0; // 0x0
2537825376
field public static final int TEXT_DIRECTION_LOCALE = 5; // 0x5

core/java/android/view/View.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1864,7 +1864,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
18641864

18651865
/**
18661866
* Default horizontal layout direction.
1867-
* @hide
18681867
*/
18691868
private static final int LAYOUT_DIRECTION_DEFAULT = LAYOUT_DIRECTION_INHERIT;
18701869

@@ -1914,7 +1913,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
19141913
/**
19151914
* Default text direction is inherited
19161915
*/
1917-
public static int TEXT_DIRECTION_DEFAULT = TEXT_DIRECTION_INHERIT;
1916+
private static final int TEXT_DIRECTION_DEFAULT = TEXT_DIRECTION_INHERIT;
19181917

19191918
/**
19201919
* Bit shift to get the horizontal layout direction. (bits after LAYOUT_DIRECTION_RESOLVED)
@@ -2024,7 +2023,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
20242023
/**
20252024
* Default text alignment is inherited
20262025
*/
2027-
public static int TEXT_ALIGNMENT_DEFAULT = TEXT_ALIGNMENT_GRAVITY;
2026+
private static final int TEXT_ALIGNMENT_DEFAULT = TEXT_ALIGNMENT_GRAVITY;
20282027

20292028
/**
20302029
* Bit shift to get the horizontal layout direction. (bits after DRAG_HOVERED)
@@ -3224,7 +3223,7 @@ public View(Context context) {
32243223
mContext = context;
32253224
mResources = context != null ? context.getResources() : null;
32263225
mViewFlags = SOUND_EFFECTS_ENABLED | HAPTIC_FEEDBACK_ENABLED;
3227-
// Set layout and text direction defaults
3226+
// Set some flags defaults
32283227
mPrivateFlags2 =
32293228
(LAYOUT_DIRECTION_DEFAULT << PFLAG2_LAYOUT_DIRECTION_MASK_SHIFT) |
32303229
(TEXT_DIRECTION_DEFAULT << PFLAG2_TEXT_DIRECTION_MASK_SHIFT) |

0 commit comments

Comments
 (0)