Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 72898e98 authored by Fabrice Di Meglio's avatar Fabrice Di Meglio
Browse files

FIx bug #7414801 Should make private and final View.TEXT_DIRECTION_DEFAULT and... 

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
parent f704e9f6

api/17.txt

+0 −2
Original line number Diff line number Diff line
@@ -25364,7 +25364,6 @@ package android.view { 
    field public static final int SYSTEM_UI_FLAG_VISIBLE = 0; // 0x0

    field public static final int SYSTEM_UI_LAYOUT_FLAGS = 1536; // 0x600

    field public static final int TEXT_ALIGNMENT_CENTER = 4; // 0x4

    field public static int TEXT_ALIGNMENT_DEFAULT;

    field public static final int TEXT_ALIGNMENT_GRAVITY = 1; // 0x1

    field public static final int TEXT_ALIGNMENT_INHERIT = 0; // 0x0

    field public static final int TEXT_ALIGNMENT_TEXT_END = 3; // 0x3
@@ -25372,7 +25371,6 @@ package android.view { 
    field public static final int TEXT_ALIGNMENT_VIEW_END = 6; // 0x6

    field public static final int TEXT_ALIGNMENT_VIEW_START = 5; // 0x5

    field public static final int TEXT_DIRECTION_ANY_RTL = 2; // 0x2

    field public static int TEXT_DIRECTION_DEFAULT;

    field public static final int TEXT_DIRECTION_FIRST_STRONG = 1; // 0x1

    field public static final int TEXT_DIRECTION_INHERIT = 0; // 0x0

    field public static final int TEXT_DIRECTION_LOCALE = 5; // 0x5

api/current.txt

+0 −2
Original line number Diff line number Diff line
@@ -25364,7 +25364,6 @@ package android.view { 
    field public static final int SYSTEM_UI_FLAG_VISIBLE = 0; // 0x0

    field public static final int SYSTEM_UI_LAYOUT_FLAGS = 1536; // 0x600

    field public static final int TEXT_ALIGNMENT_CENTER = 4; // 0x4

    field public static int TEXT_ALIGNMENT_DEFAULT;

    field public static final int TEXT_ALIGNMENT_GRAVITY = 1; // 0x1

    field public static final int TEXT_ALIGNMENT_INHERIT = 0; // 0x0

    field public static final int TEXT_ALIGNMENT_TEXT_END = 3; // 0x3
@@ -25372,7 +25371,6 @@ package android.view { 
    field public static final int TEXT_ALIGNMENT_VIEW_END = 6; // 0x6

    field public static final int TEXT_ALIGNMENT_VIEW_START = 5; // 0x5

    field public static final int TEXT_DIRECTION_ANY_RTL = 2; // 0x2

    field public static int TEXT_DIRECTION_DEFAULT;

    field public static final int TEXT_DIRECTION_FIRST_STRONG = 1; // 0x1

    field public static final int TEXT_DIRECTION_INHERIT = 0; // 0x0

    field public static final int TEXT_DIRECTION_LOCALE = 5; // 0x5

core/java/android/view/View.java

+3 −4
Original line number Diff line number Diff line
@@ -1864,7 +1864,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 














    /**















     * Default horizontal layout direction.













     * @hide















     */















    private static final int LAYOUT_DIRECTION_DEFAULT = LAYOUT_DIRECTION_INHERIT;
























@@ -1914,7 +1913,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













    /**















     * Default text direction is inherited















     */













    public static int TEXT_DIRECTION_DEFAULT = TEXT_DIRECTION_INHERIT;













    private static final int TEXT_DIRECTION_DEFAULT = TEXT_DIRECTION_INHERIT;





























    /**















     * 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,













    /**















     * Default text alignment is inherited















     */













    public static int TEXT_ALIGNMENT_DEFAULT = TEXT_ALIGNMENT_GRAVITY;













    private static final int TEXT_ALIGNMENT_DEFAULT = TEXT_ALIGNMENT_GRAVITY;





























    /**















      * Bit shift to get the horizontal layout direction. (bits after DRAG_HOVERED)










@@ -3224,7 +3223,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













        mContext = context;















        mResources = context != null ? context.getResources() : null;















        mViewFlags = SOUND_EFFECTS_ENABLED | HAPTIC_FEEDBACK_ENABLED;













        // Set layout and text direction defaults













        // Set some flags defaults















        mPrivateFlags2 =















                (LAYOUT_DIRECTION_DEFAULT << PFLAG2_LAYOUT_DIRECTION_MASK_SHIFT) |















                (TEXT_DIRECTION_DEFAULT << PFLAG2_TEXT_DIRECTION_MASK_SHIFT) |