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

am e103029d: Merge "Avoid keyguard UI layout dimensions underflow" into mnc-dev

Browse Source 
* commit 'e103029dbc457596661ae4066aabcb2a35f07dfd':
  Avoid keyguard UI layout dimensions underflow
This commit is contained in:
Xiyuan Xia
2015-05-29 14:27:20 +00:00
committed by Android Git Automerger
parent ead381a3d9 e103029dbc
commit 6cacbd2d47
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/Keyguard/src/com/android/keyguard/KeyguardSecurityViewFlipper.java
View File

@@ -203,8 +203,8 @@ public class KeyguardSecurityViewFlipper extends ViewFlipper implements Keyguard
final int wPadding = getPaddingLeft() + getPaddingRight();
final int hPadding = getPaddingTop() + getPaddingBottom();
maxWidth -= wPadding;
maxHeight -= hPadding;
maxWidth = Math.max(0, maxWidth - wPadding);
maxHeight = Math.max(0, maxHeight - hPadding);
int width = widthMode == MeasureSpec.EXACTLY ? widthSize : 0;
int height = heightMode == MeasureSpec.EXACTLY ? heightSize : 0;