diff options
| author | Ashley Rose <ashleyrose@google.com> | 2019-03-06 18:38:18 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-03-06 18:38:18 +0000 |
| commit | 0be2720c5b0504823fa94ab2a3aae024ac5bebbb (patch) | |
| tree | dda49374b5f957c70facc33b8509e41b475fbe00 /core/java/android/widget/LinearLayout.java | |
| parent | 56ff8c44a529664d0d02fd692fe3612c025ac681 (diff) | |
| parent | de3b4a78cd9de88323ddf89c471595a0432c64c1 (diff) | |
Merge "Add @InspectableProperty annotations to LayoutParams"
Diffstat (limited to 'core/java/android/widget/LinearLayout.java')
| -rw-r--r-- | core/java/android/widget/LinearLayout.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/widget/LinearLayout.java b/core/java/android/widget/LinearLayout.java index e833df9d498a..bdde4352d69d 100644 --- a/core/java/android/widget/LinearLayout.java +++ b/core/java/android/widget/LinearLayout.java @@ -1987,6 +1987,7 @@ public class LinearLayout extends ViewGroup { * will be pro-rated among all views whose weight is greater than 0. */ @ViewDebug.ExportedProperty(category = "layout") + @InspectableProperty(name = "layout_weight") public float weight; /** @@ -2010,6 +2011,9 @@ public class LinearLayout extends ViewGroup { @ViewDebug.IntToString(from = Gravity.CENTER, to = "CENTER"), @ViewDebug.IntToString(from = Gravity.FILL, to = "FILL") }) + @InspectableProperty( + name = "layout_gravity", + valueType = InspectableProperty.ValueType.GRAVITY) public int gravity = -1; /** |