Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Brian Colonna
2012-10-30 17:32:36 -07:00
committed by Android (Google) Code Review
parent 7ff5535895 ddbf138d11
commit d76b320b73
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/com/android/internal/widget/FaceUnlockView.java
View File

@@ -53,15 +53,17 @@ public class FaceUnlockView extends RelativeLayout {
@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);
}
}