summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Peter Ng <petergng@google.com> 2011-11-10 14:31:09 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 2011-11-10 14:31:09 -0800
commit15843aa5f66fee8eee5e634508dbf83a4e5ab55d (patch)
treed8606a578c3a8c6086be503b38025120c0b98ec8
parentbce7812baba05e969406f8644595ef6237e16a41 (diff)
parent7bc60abc97f77cc2478f5d19c391ebdb1433a893 (diff)
Merge "lock pattern width spec set to max" into ics-mr1
-rw-r--r--core/java/com/android/internal/widget/LockPatternView.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/com/android/internal/widget/LockPatternView.java b/core/java/com/android/internal/widget/LockPatternView.java
index a2fc6e2efdcd..0d9cf9ac4d27 100644
--- a/core/java/com/android/internal/widget/LockPatternView.java
+++ b/core/java/com/android/internal/widget/LockPatternView.java
@@ -463,7 +463,7 @@ public class LockPatternView extends View {
result = desired;
break;
case MeasureSpec.AT_MOST:
- result = Math.min(specSize, desired);
+ result = Math.max(specSize, desired);
break;
case MeasureSpec.EXACTLY:
default: