Merge "Support for maximum values in layout GridLayout." (d307878e) · Commits · e / os / android_frameworks_base

api/current.txt

+13 −6

Original line number	Diff line number	Diff line
		@@ -596,10 +596,10 @@ package android {
		field public static final int layout_centerInParent = 16843151; // 0x101018f
		field public static final int layout_centerVertical = 16843153; // 0x1010191
		field public static final int layout_column = 16843084; // 0x101014c
		field public static final int layout_columnSpan = 16843646; // 0x101037e
		field public static final int layout_columnWeight = 16843647; // 0x101037f
		field public static final int layout_columnSpan = 16843645; // 0x101037d
		field public static final int layout_gravity = 16842931; // 0x10100b3
		field public static final int layout_height = 16842997; // 0x10100f5
		field public static final int layout_heightSpec = 16843647; // 0x101037f
		field public static final int layout_margin = 16842998; // 0x10100f6
		field public static final int layout_marginBottom = 16843002; // 0x10100fa
		field public static final int layout_marginEnd = 16843675; // 0x101039b
		@@ -609,13 +609,13 @@ package android {
		field public static final int layout_marginTop = 16843000; // 0x10100f8
		field public static final int layout_row = 16843643; // 0x101037b
		field public static final int layout_rowSpan = 16843644; // 0x101037c
		field public static final int layout_rowWeight = 16843645; // 0x101037d
		field public static final int layout_scale = 16843155; // 0x1010193
		field public static final int layout_span = 16843085; // 0x101014d
		field public static final int layout_toLeftOf = 16843138; // 0x1010182
		field public static final int layout_toRightOf = 16843139; // 0x1010183
		field public static final int layout_weight = 16843137; // 0x1010181
		field public static final int layout_width = 16842996; // 0x10100f4
		field public static final int layout_widthSpec = 16843646; // 0x101037e
		field public static final int layout_x = 16843135; // 0x101017f
		field public static final int layout_y = 16843136; // 0x1010180
		field public static final int left = 16843181; // 0x10101ad
		@@ -24892,9 +24892,9 @@ package android.widget {
		}

		public class GridLayout extends android.view.ViewGroup {
		ctor public GridLayout(android.content.Context);
		ctor public GridLayout(android.content.Context, android.util.AttributeSet, int);
		ctor public GridLayout(android.content.Context, android.util.AttributeSet);
		ctor public GridLayout(android.content.Context);
		method public int getAlignmentMode();
		method public int getColumnCount();
		method public int getOrientation();
		@@ -24914,8 +24914,11 @@ package android.widget {
		field public static final int ALIGN_MARGINS = 1; // 0x1
		field public static final android.widget.GridLayout.Alignment BASELINE;
		field public static final android.widget.GridLayout.Alignment BOTTOM;
		field public static final android.widget.GridLayout.Spec CAN_SHRINK;
		field public static final android.widget.GridLayout.Spec CAN_STRETCH;
		field public static final android.widget.GridLayout.Alignment CENTER;
		field public static final android.widget.GridLayout.Alignment FILL;
		field public static final android.widget.GridLayout.Spec FIXED;
		field public static final int HORIZONTAL = 0; // 0x0
		field public static final android.widget.GridLayout.Alignment LEFT;
		field public static final android.widget.GridLayout.Alignment RIGHT;
		@@ -24942,9 +24945,13 @@ package android.widget {
		ctor public GridLayout.LayoutParams(android.content.Context, android.util.AttributeSet);
		method public void setGravity(int);
		field public android.widget.GridLayout.Group columnGroup;
		field public float columnWeight;
		field public android.widget.GridLayout.Spec heightSpec;
		field public android.widget.GridLayout.Group rowGroup;
		field public float rowWeight;
		field public android.widget.GridLayout.Spec widthSpec;
		}

		public static abstract class GridLayout.Spec {
		ctor public GridLayout.Spec();
		}

		public class GridView extends android.widget.AbsListView {

core/java/android/widget/GridLayout.java

+418 −307

File changed.

Preview size limit exceeded, changes collapsed.

core/res/res/layout/keyguard_screen_password_landscape.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -156,7 +156,7 @@
		/>

		<!-- Column 1 -->
		<Space android:layout_columnWeight="1" android:layout_rowSpan="11" />
		<Space android:layout_widthSpec="canStretch" android:layout_rowSpan="11" />

		<!-- Column 2 - password entry field and PIN keyboard -->
		<LinearLayout

core/res/res/layout/keyguard_screen_tab_unlock_land.xml

+4 −1

Original line number	Diff line number	Diff line
		@@ -169,7 +169,10 @@
		</LinearLayout>

		<!-- Column 1 -->
		<Space android:width="20dip" android:layout_columnWeight="1" android:layout_rowSpan="10" />
		<Space
		android:width="20dip"
		android:layout_heightSpec="canStretch"
		android:layout_rowSpan="10" />

		<!-- Column 2 -->
		<com.android.internal.widget.multiwaveview.MultiWaveView

core/res/res/layout/keyguard_screen_unlock_landscape.xml

+5 −3

Original line number	Diff line number	Diff line
		@@ -102,7 +102,9 @@
		<Space
		android:layout_height="43dip"
		android:layout_gravity="fill"
		android:layout_rowWeight="1" android:layout_columnWeight="1" />
		android:layout_heightSpec="canStretch"
		android:layout_widthSpec="canStretch"
		/>

		<TextView android:id="@+id/carrier"
		android:layout_gravity="right"