summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2018-02-23 21:05:23 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-02-23 21:05:23 +0000
commitb6ca928e1f48fb4fde57309e8ee455db373cd250 (patch)
tree8d4dd67fbc7d87cf95ced3fecc030975804267e7 /core/java
parent08ddee7303b945b65bc97998b2ade9a5943acbba (diff)
parent8c8b9fb02a2dae7f6404a710550bad833bff3e0e (diff)
Merge "Provide the option to disable fading the pattern."
Diffstat (limited to 'core/java')
-rw-r--r--core/java/com/android/internal/widget/LockPatternView.java21
1 files changed, 19 insertions, 2 deletions
diff --git a/core/java/com/android/internal/widget/LockPatternView.java b/core/java/com/android/internal/widget/LockPatternView.java
index 7a248f264274..51dd92961f54 100644
--- a/core/java/com/android/internal/widget/LockPatternView.java
+++ b/core/java/com/android/internal/widget/LockPatternView.java
@@ -125,6 +125,7 @@ public class LockPatternView extends View {
private boolean mInStealthMode = false;
private boolean mEnableHapticFeedback = true;
private boolean mPatternInProgress = false;
+ private boolean mFadePattern = true;
private float mHitFactor = 0.6f;
@@ -376,6 +377,14 @@ public class LockPatternView extends View {
}
/**
+ * Set whether the pattern should fade as it's being drawn. If
+ * true, each segment of the pattern fades over time.
+ */
+ public void setFadePattern(boolean fadePattern) {
+ mFadePattern = fadePattern;
+ }
+
+ /**
* Set whether the view will use tactile feedback. If true, there will be
* tactile feedback as the user enters the pattern.
*
@@ -1167,10 +1176,18 @@ public class LockPatternView extends View {
currentPath.moveTo(lastX, lastY);
if (state.lineEndX != Float.MIN_VALUE && state.lineEndY != Float.MIN_VALUE) {
currentPath.lineTo(state.lineEndX, state.lineEndY);
- mPathPaint.setAlpha((int) 255 - lineFadeVal );
+ if (mFadePattern) {
+ mPathPaint.setAlpha((int) 255 - lineFadeVal );
+ } else {
+ mPathPaint.setAlpha(255);
+ }
} else {
currentPath.lineTo(centerX, centerY);
- mPathPaint.setAlpha((int) 255 - lineFadeVal );
+ if (mFadePattern) {
+ mPathPaint.setAlpha((int) 255 - lineFadeVal );
+ } else {
+ mPathPaint.setAlpha(255);
+ }
}
canvas.drawPath(currentPath, mPathPaint);
}