Merge "Minor tweaks to GridLayout for KeyGuardScreenUnlock." (0edc5297) · Commits · e / os / android_frameworks_base

core/java/android/widget/GridLayout.java

+24 −26

Original line number	Diff line number	Diff line
		@@ -535,7 +535,7 @@ public class GridLayout extends ViewGroup {
		return result;
		}

		private int getDefaultMargin(View c, boolean leading, boolean horizontal) {
		private int getDefaultMargin(View c, boolean horizontal, boolean leading) {
		// In the absence of any other information, calculate a default gap such
		// that, in a grid of identical components, the heights and the vertical
		// gaps are in the proportion of the golden ratio.
		@@ -544,12 +544,12 @@ public class GridLayout extends ViewGroup {
		return (int) (c.getMeasuredHeight() / GOLDEN_RATIO / 2);
		}

		private int getDefaultMargin(View c, boolean isAtEdge, boolean leading, boolean horizontal) {
		private int getDefaultMargin(View c, boolean isAtEdge, boolean horizontal, boolean leading) {
		// todo remove DEFAULT_CONTAINER_MARGIN. Use padding? Seek advice on Themes/Styles, etc.
		return isAtEdge ? DEFAULT_CONTAINER_MARGIN : getDefaultMargin(c, leading, horizontal);
		return isAtEdge ? DEFAULT_CONTAINER_MARGIN : getDefaultMargin(c, horizontal, leading);
		}

		private int getDefaultMarginValue(View c, LayoutParams p, boolean leading, boolean horizontal) {
		private int getDefaultMarginValue(View c, LayoutParams p, boolean horizontal, boolean leading) {
		if (!mUseDefaultMargins) {
		return 0;
		}
		@@ -558,15 +558,19 @@ public class GridLayout extends ViewGroup {
		Interval span = group.span;
		boolean isAtEdge = leading ? (span.min == 0) : (span.max == axis.getCount());

		return getDefaultMargin(c, isAtEdge, leading, horizontal);
		return getDefaultMargin(c, isAtEdge, horizontal, leading);
		}

		private int getMargin(View view, boolean leading, boolean horizontal) {
		private int getMargin(View view, boolean horizontal, boolean leading) {
		LayoutParams lp = getLayoutParams(view);
		int margin = horizontal ?
		(leading ? lp.leftMargin : lp.rightMargin) :
		(leading ? lp.topMargin : lp.bottomMargin);
		return margin == UNDEFINED ? getDefaultMarginValue(view, lp, leading, horizontal) : margin;
		return margin == UNDEFINED ? getDefaultMarginValue(view, lp, horizontal, leading) : margin;
		}

		private int getTotalMargin(View child, boolean horizontal) {
		return getMargin(child, horizontal, true) + getMargin(child, horizontal, false);
		}

		private static int valueIfDefined(int value, int defaultValue) {
		@@ -749,8 +753,8 @@ public class GridLayout extends ViewGroup {
		View c = getChildAt(i);
		drawRectangle(canvas,
		c.getLeft() - getMargin(c, true, true),
		c.getTop() - getMargin(c, true, false),
		c.getRight() + getMargin(c, false, true),
		c.getTop() - getMargin(c, false, true),
		c.getRight() + getMargin(c, true, false),
		c.getBottom() + getMargin(c, false, false), paint);
		}
		}
		@@ -794,17 +798,12 @@ public class GridLayout extends ViewGroup {
		return c.getVisibility() == View.GONE;
		}

		private void measureChildWithMargins(View child,
		int parentWidthMeasureSpec, int parentHeightMeasureSpec) {

		private void measureChildWithMargins(View child, int widthMeasureSpec, int heightMeasureSpec) {
		LayoutParams lp = getLayoutParams(child);
		int hMargins = getMargin(child, true, true) + getMargin(child, false, true);
		int childWidthMeasureSpec = getChildMeasureSpec(parentWidthMeasureSpec,
		mPaddingLeft + mPaddingRight + hMargins, lp.width);
		int vMargins = getMargin(child, true, false) + getMargin(child, false, false);
		int childHeightMeasureSpec = getChildMeasureSpec(parentHeightMeasureSpec,
		mPaddingTop + mPaddingBottom + vMargins, lp.height);

		int childWidthMeasureSpec = getChildMeasureSpec(widthMeasureSpec,
		mPaddingLeft + mPaddingRight + getTotalMargin(child, true), lp.width);
		int childHeightMeasureSpec = getChildMeasureSpec(heightMeasureSpec,
		mPaddingTop + mPaddingBottom + getTotalMargin(child, false), lp.height);
		child.measure(childWidthMeasureSpec, childHeightMeasureSpec);
		}

		@@ -842,9 +841,7 @@ public class GridLayout extends ViewGroup {
		private int getMeasurementIncludingMargin(View c, boolean horizontal, int measurementType) {
		int result = getMeasurement(c, horizontal, measurementType);
		if (mAlignmentMode == ALIGN_MARGINS) {
		int leadingMargin = getMargin(c, true, horizontal);
		int trailingMargin = getMargin(c, false, horizontal);
		return result + leadingMargin + trailingMargin;
		return result + getTotalMargin(c, horizontal);
		}
		return result;
		}
		@@ -919,8 +916,8 @@ public class GridLayout extends ViewGroup {

		if (mAlignmentMode == ALIGN_MARGINS) {
		int leftMargin = getMargin(c, true, true);
		int topMargin = getMargin(c, true, false);
		int rightMargin = getMargin(c, false, true);
		int topMargin = getMargin(c, false, true);
		int rightMargin = getMargin(c, true, false);
		int bottomMargin = getMargin(c, false, false);

		// Same calculation as getMeasurementIncludingMargin()
		@@ -1387,7 +1384,7 @@ public class GridLayout extends ViewGroup {
		Group g = horizontal ? lp.columnGroup : lp.rowGroup;
		Interval span = g.span;
		int index = leading ? span.min : span.max;
		margins[index] = max(margins[index], getMargin(c, leading, horizontal));
		margins[index] = max(margins[index], getMargin(c, horizontal, leading));
		}
		}

		@@ -1817,7 +1814,8 @@ public class GridLayout extends ViewGroup {
		}

		private int getDefaultWeight(int size) {
		return (size == MATCH_PARENT) ? DEFAULT_WEIGHT_1 : DEFAULT_WEIGHT_0;
		//return (size == MATCH_PARENT) ? DEFAULT_WEIGHT_1 : DEFAULT_WEIGHT_0;
		return DEFAULT_WEIGHT_0;
		}

		private void init(Context context, AttributeSet attrs, int defaultGravity) {

core/java/com/android/internal/widget/LockPatternView.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -464,8 +464,7 @@ public class LockPatternView extends View {
		break;
		case MeasureSpec.EXACTLY:
		default:
		// use the specified size, if non-zero
		result = specSize != 0 ? specSize : desired;
		result = specSize;
		}
		return result;
		}

core/res/res/layout/keyguard_screen_unlock_portrait.xml

+7 −2

Original line number	Diff line number	Diff line
		@@ -101,6 +101,10 @@
		android:visibility="gone"
		/>

		<!-- We need MATCH_PARENT here only to force the size of the parent to be passed to
		the pattern view for it to compute its size. This is an unusual case, caused by
		LockPatternView's requirement to maintain a square aspect ratio based on the width
		of the screen. -->
		<com.android.internal.widget.LockPatternView
		android:id="@+id/lockPattern"
		android:layout_width="match_parent"
		@@ -109,6 +113,8 @@
		android:layout_marginRight="8dip"
		android:layout_marginBottom="4dip"
		android:layout_marginLeft="8dip"
		android:layout_gravity="center\|bottom"
		android:layout_rowWeight="1"
		/>

		<TextView
		@@ -123,8 +129,7 @@
		<!-- Footer: an emergency call button and an initially hidden "Forgot pattern" button -->
		<LinearLayout
		android:orientation="horizontal"
		android:layout_width="match_parent"
		android:layout_gravity="center">
		android:layout_gravity="fill_horizontal">

		<Button android:id="@+id/emergencyCallButton"
		android:layout_width="wrap_content"