diff options
| author | Jon Miranda <jonmiranda@google.com> | 2014-07-29 20:51:38 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-24 15:36:21 +0000 |
| commit | 0615026ba15d7d7a68d0a191d449da47a1ceabea (patch) | |
| tree | 562b735856df95a27cc89a2e02fe79fd0a4266f5 /core/java/android/widget | |
| parent | 9469cdde2ce55051b18fdbd6bf80bc710517c358 (diff) | |
| parent | 4597e9806948256e82b9f1cdaa7019cbbd912668 (diff) | |
| download | frameworks_base-0615026ba15d7d7a68d0a191d449da47a1ceabea.zip frameworks_base-0615026ba15d7d7a68d0a191d449da47a1ceabea.tar.gz frameworks_base-0615026ba15d7d7a68d0a191d449da47a1ceabea.tar.bz2 | |
Merge "Exposed getLocationOnScreen, added formatToHexString method." into lmp-dev
Diffstat (limited to 'core/java/android/widget')
| -rw-r--r-- | core/java/android/widget/LinearLayout.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/widget/LinearLayout.java b/core/java/android/widget/LinearLayout.java index 82e624d..6476cdc 100644 --- a/core/java/android/widget/LinearLayout.java +++ b/core/java/android/widget/LinearLayout.java @@ -156,7 +156,7 @@ public class LinearLayout extends ViewGroup { equals = Gravity.FILL, name = "FILL"), @ViewDebug.FlagToString(mask = Gravity.RELATIVE_LAYOUT_DIRECTION, equals = Gravity.RELATIVE_LAYOUT_DIRECTION, name = "RELATIVE") - }) + }, formatToHexString = true) private int mGravity = Gravity.START | Gravity.TOP; @ViewDebug.ExportedProperty(category = "measurement") |