From de3b4a78cd9de88323ddf89c471595a0432c64c1 Mon Sep 17 00:00:00 2001 From: Ashley Rose Date: Mon, 4 Mar 2019 16:44:07 -0500 Subject: [PATCH] Add @InspectableProperty annotations to LayoutParams Change-Id: I69eb71bec8bbf36564e178a3ddf4be9e00e2d531 Fix: 126913705 Test: m framework --- core/java/android/app/ActionBar.java | 4 ++++ core/java/android/view/ViewGroup.java | 12 ++++++++++++ core/java/android/widget/AbsoluteLayout.java | 3 +++ core/java/android/widget/FrameLayout.java | 3 +++ core/java/android/widget/LinearLayout.java | 4 ++++ core/java/android/widget/RelativeLayout.java | 1 + core/java/android/widget/TableRow.java | 3 +++ core/java/com/android/internal/widget/ViewPager.java | 4 ++++ 8 files changed, 34 insertions(+) diff --git a/core/java/android/app/ActionBar.java b/core/java/android/app/ActionBar.java index 831cac261d345..e57327991a82d 100644 --- a/core/java/android/app/ActionBar.java +++ b/core/java/android/app/ActionBar.java @@ -36,6 +36,7 @@ import android.view.ViewDebug; import android.view.ViewGroup; import android.view.ViewHierarchyEncoder; import android.view.Window; +import android.view.inspector.InspectableProperty; import android.widget.SpinnerAdapter; import java.lang.annotation.Retention; @@ -1374,6 +1375,9 @@ public abstract class ActionBar { @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 = Gravity.NO_GRAVITY; public LayoutParams(@NonNull Context c, AttributeSet attrs) { diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java index f2474a58b1769..4dc20d4fad6dd 100644 --- a/core/java/android/view/ViewGroup.java +++ b/core/java/android/view/ViewGroup.java @@ -7845,6 +7845,10 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager @ViewDebug.IntToString(from = MATCH_PARENT, to = "MATCH_PARENT"), @ViewDebug.IntToString(from = WRAP_CONTENT, to = "WRAP_CONTENT") }) + @InspectableProperty(name = "layout_width", enumMapping = { + @InspectableProperty.EnumMap(name = "match_parent", value = MATCH_PARENT), + @InspectableProperty.EnumMap(name = "wrap_content", value = WRAP_CONTENT) + }) public int width; /** @@ -7856,6 +7860,10 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager @ViewDebug.IntToString(from = MATCH_PARENT, to = "MATCH_PARENT"), @ViewDebug.IntToString(from = WRAP_CONTENT, to = "WRAP_CONTENT") }) + @InspectableProperty(name = "layout_height", enumMapping = { + @InspectableProperty.EnumMap(name = "match_parent", value = MATCH_PARENT), + @InspectableProperty.EnumMap(name = "wrap_content", value = WRAP_CONTENT) + }) public int height; /** @@ -8028,6 +8036,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager * to this field. */ @ViewDebug.ExportedProperty(category = "layout") + @InspectableProperty(name = "layout_marginLeft") public int leftMargin; /** @@ -8036,6 +8045,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager * to this field. */ @ViewDebug.ExportedProperty(category = "layout") + @InspectableProperty(name = "layout_marginTop") public int topMargin; /** @@ -8044,6 +8054,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager * to this field. */ @ViewDebug.ExportedProperty(category = "layout") + @InspectableProperty(name = "layout_marginRight") public int rightMargin; /** @@ -8052,6 +8063,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager * to this field. */ @ViewDebug.ExportedProperty(category = "layout") + @InspectableProperty(name = "layout_marginBottom") public int bottomMargin; /** diff --git a/core/java/android/widget/AbsoluteLayout.java b/core/java/android/widget/AbsoluteLayout.java index 4ce0d5d21fd6f..e3499f9f961ff 100644 --- a/core/java/android/widget/AbsoluteLayout.java +++ b/core/java/android/widget/AbsoluteLayout.java @@ -21,6 +21,7 @@ import android.content.res.TypedArray; import android.util.AttributeSet; import android.view.View; import android.view.ViewGroup; +import android.view.inspector.InspectableProperty; import android.widget.RemoteViews.RemoteView; @@ -159,10 +160,12 @@ public class AbsoluteLayout extends ViewGroup { /** * The horizontal, or X, location of the child within the view group. */ + @InspectableProperty(name = "layout_x") public int x; /** * The vertical, or Y, location of the child within the view group. */ + @InspectableProperty(name = "layout_y") public int y; /** diff --git a/core/java/android/widget/FrameLayout.java b/core/java/android/widget/FrameLayout.java index 3570c79430a44..69da9112ca010 100644 --- a/core/java/android/widget/FrameLayout.java +++ b/core/java/android/widget/FrameLayout.java @@ -443,6 +443,9 @@ public class FrameLayout extends ViewGroup { * @see android.view.Gravity * @attr ref android.R.styleable#FrameLayout_Layout_layout_gravity */ + @InspectableProperty( + name = "layout_gravity", + valueType = InspectableProperty.ValueType.GRAVITY) public int gravity = UNSPECIFIED_GRAVITY; public LayoutParams(@NonNull Context c, @Nullable AttributeSet attrs) { diff --git a/core/java/android/widget/LinearLayout.java b/core/java/android/widget/LinearLayout.java index e833df9d498ad..bdde4352d69d8 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; /** diff --git a/core/java/android/widget/RelativeLayout.java b/core/java/android/widget/RelativeLayout.java index 109c0a432c1b8..8ee31e212cbfc 100644 --- a/core/java/android/widget/RelativeLayout.java +++ b/core/java/android/widget/RelativeLayout.java @@ -1286,6 +1286,7 @@ public class RelativeLayout extends ViewGroup { * the anchor's visibility is GONE. */ @ViewDebug.ExportedProperty(category = "layout") + @InspectableProperty(name = "layout_alignWithParentIfMissing") public boolean alignWithParent; public LayoutParams(Context c, AttributeSet attrs) { diff --git a/core/java/android/widget/TableRow.java b/core/java/android/widget/TableRow.java index 22931fcb3e976..ac23093a00735 100644 --- a/core/java/android/widget/TableRow.java +++ b/core/java/android/widget/TableRow.java @@ -26,6 +26,7 @@ import android.view.View; import android.view.ViewDebug; import android.view.ViewGroup; import android.view.ViewHierarchyEncoder; +import android.view.inspector.InspectableProperty; /** *

A layout that arranges its children horizontally. A TableRow should @@ -398,12 +399,14 @@ public class TableRow extends LinearLayout { *

The column index of the cell represented by the widget.

*/ @ViewDebug.ExportedProperty(category = "layout") + @InspectableProperty(name = "layout_column") public int column; /** *

The number of columns the widgets spans over.

*/ @ViewDebug.ExportedProperty(category = "layout") + @InspectableProperty(name = "layout_span") public int span; private static final int LOCATION = 0; diff --git a/core/java/com/android/internal/widget/ViewPager.java b/core/java/com/android/internal/widget/ViewPager.java index 64bdc6e1eb37a..f48b56d7af365 100644 --- a/core/java/com/android/internal/widget/ViewPager.java +++ b/core/java/com/android/internal/widget/ViewPager.java @@ -46,6 +46,7 @@ import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.AccessibilityNodeInfo; import android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction; import android.view.animation.Interpolator; +import android.view.inspector.InspectableProperty; import android.widget.EdgeEffect; import android.widget.Scroller; @@ -2779,6 +2780,9 @@ public class ViewPager extends ViewGroup { * Where to position the view page within the overall ViewPager * container; constants are defined in {@link android.view.Gravity}. */ + @InspectableProperty( + name = "layout_gravity", + valueType = InspectableProperty.ValueType.GRAVITY) public int gravity; /**