Merge "Fixed misplacement of cancel(X) button for Face Unlock" into jb-mr1-lockscreen-dev

Author: Brian Colonna

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

@@ -53,15 +53,17 @@ private int resolveMeasured(int measureSpec, int desired)
 
     @Override
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-
         final int minimumWidth = getSuggestedMinimumWidth();
         final int minimumHeight = getSuggestedMinimumHeight();
         int viewWidth = resolveMeasured(widthMeasureSpec, minimumWidth);
         int viewHeight = resolveMeasured(heightMeasureSpec, minimumHeight);
 
-        viewWidth = viewHeight = Math.min(viewWidth, viewHeight);
-        Log.v(TAG, "FaceUnlockView dimensions: " + viewWidth + "x" + viewHeight);
-        setMeasuredDimension(viewWidth, viewHeight);
+        final int chosenSize = Math.min(viewWidth, viewHeight);
+        final int newWidthMeasureSpec =
+                MeasureSpec.makeMeasureSpec(chosenSize, MeasureSpec.AT_MOST);
+        final int newHeightMeasureSpec =
+                MeasureSpec.makeMeasureSpec(chosenSize, MeasureSpec.AT_MOST);
+
+        super.onMeasure(newWidthMeasureSpec, newHeightMeasureSpec);
     }
 }