Merge "Fix keyguard measurement bugs" into jb-mr1-lockscreen-dev

Author: adamp

policy/src/com/android/internal/policy/impl/keyguard/KeyguardSecurityViewFlipper.java

@@ -219,10 +219,10 @@ protected void onMeasure(int widthSpec, int heightSpec) {
 
             child.measure(childWidthSpec, childHeightSpec);
 
-            width = Math.max(width, Math.min(child.getMeasuredWidth(), widthSize));
-            height = Math.max(height, Math.min(child.getMeasuredHeight(), heightSize));
+            width = Math.max(width, Math.min(child.getMeasuredWidth(), widthSize - wPadding));
+            height = Math.max(height, Math.min(child.getMeasuredHeight(), heightSize - hPadding));
         }
-        setMeasuredDimension(width, height);
+        setMeasuredDimension(width + wPadding, height + hPadding);
     }
 
     private int makeChildMeasureSpec(int maxSize, int childDimen) {

policy/src/com/android/internal/policy/impl/keyguard/MultiPaneChallengeLayout.java

@@ -363,7 +363,7 @@ private void layoutWithGravity(int width, int height, View child, Rect padding,
             adjustedWidth = (int) (paddedWidth * lp.centerWithinArea + 0.5f);
             adjustedHeight = height;
         } else if (fixedLayoutVertical) {
-            final int paddedHeight = height - padding.top - padding.bottom;
+            final int paddedHeight = height - getPaddingTop() - getPaddingBottom();
             adjustedWidth = width;
             adjustedHeight = (int) (paddedHeight * lp.centerWithinArea + 0.5f);
         } else {