diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2012-10-10 17:26:41 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-10 17:26:41 -0700 |
| commit | b8021a88e5c00ebd985a348b56af29c95a178a90 (patch) | |
| tree | eb1bcf1f3cb2185303f1b44966b603ffc5f20ea5 /api | |
| parent | 02f0daa580a3d97f64e126198e42c3247ee37517 (diff) | |
| parent | 2918ab6c3258639148b8a5c78a34483af195246e (diff) | |
| download | frameworks_base-b8021a88e5c00ebd985a348b56af29c95a178a90.zip frameworks_base-b8021a88e5c00ebd985a348b56af29c95a178a90.tar.gz frameworks_base-b8021a88e5c00ebd985a348b56af29c95a178a90.tar.bz2 | |
Merge "Fix bug #7326778 Rename LayoutParams.onResolveLayoutDirection(int)" into jb-mr1-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/17.txt | 2 | ||||
| -rw-r--r-- | api/current.txt | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -25677,7 +25677,7 @@ package android.view { ctor public ViewGroup.LayoutParams(android.content.Context, android.util.AttributeSet); ctor public ViewGroup.LayoutParams(int, int); ctor public ViewGroup.LayoutParams(android.view.ViewGroup.LayoutParams); - method public void onResolveLayoutDirection(int); + method public void resolveLayoutDirection(int); method protected void setBaseAttributes(android.content.res.TypedArray, int, int); field public static final deprecated int FILL_PARENT = -1; // 0xffffffff field public static final int MATCH_PARENT = -1; // 0xffffffff diff --git a/api/current.txt b/api/current.txt index 9af3b49..7cadf9b 100644 --- a/api/current.txt +++ b/api/current.txt @@ -25677,7 +25677,7 @@ package android.view { ctor public ViewGroup.LayoutParams(android.content.Context, android.util.AttributeSet); ctor public ViewGroup.LayoutParams(int, int); ctor public ViewGroup.LayoutParams(android.view.ViewGroup.LayoutParams); - method public void onResolveLayoutDirection(int); + method public void resolveLayoutDirection(int); method protected void setBaseAttributes(android.content.res.TypedArray, int, int); field public static final deprecated int FILL_PARENT = -1; // 0xffffffff field public static final int MATCH_PARENT = -1; // 0xffffffff |