diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2012-10-25 11:47:08 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-25 11:47:08 -0700 |
| commit | 0182dc39bd969b797614c90e44978b83ac57fd1c (patch) | |
| tree | a02c4e008653bacf79768f4f6c52ee20f35c218b /api | |
| parent | 1abaa2cb693743df9a24da265c9c6bd58991ff2c (diff) | |
| parent | 3b53061e6d2753440da04c042d26b8c4e94a5b95 (diff) | |
| download | frameworks_base-0182dc39bd969b797614c90e44978b83ac57fd1c.zip frameworks_base-0182dc39bd969b797614c90e44978b83ac57fd1c.tar.gz frameworks_base-0182dc39bd969b797614c90e44978b83ac57fd1c.tar.bz2 | |
am 3b53061e: am 3e297339: Merge "FIx bug #7414801 Should make private and final View.TEXT_DIRECTION_DEFAULT and View.TEXT_ALIGNMENT_DEFAULT constants" into jb-mr1-dev
* commit '3b53061e6d2753440da04c042d26b8c4e94a5b95':
FIx bug #7414801 Should make private and final View.TEXT_DIRECTION_DEFAULT and View.TEXT_ALIGNMENT_DEFAULT constants
Diffstat (limited to 'api')
| -rw-r--r-- | api/17.txt | 2 | ||||
| -rw-r--r-- | api/current.txt | 2 |
2 files changed, 0 insertions, 4 deletions
@@ -25365,7 +25365,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 @@ -25373,7 +25372,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 diff --git a/api/current.txt b/api/current.txt index e1e89b5..85ae413 100644 --- a/api/current.txt +++ b/api/current.txt @@ -25365,7 +25365,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 @@ -25373,7 +25372,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 |