Merge remote-tracking branch 'origin/lineage-16.0' into v1-pie (4f42c475) · Commits · e / os / android_frameworks_base

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

+5 −9

Original line number	Diff line number	Diff line
		@@ -1062,11 +1062,6 @@ public class LockPatternView extends View {
		setPatternInProgress(false);
		cancelLineAnimations();
		notifyPatternDetected();
		// Also clear pattern if fading is enabled
		if (mFadePattern) {
		clearPatternDrawLookup();
		mPatternDisplayMode = DisplayMode.Correct;
		}
		invalidate();
		}
		if (PROFILE_DRAWING) {
		@@ -1209,8 +1204,9 @@ public class LockPatternView extends View {
		// TODO: the path should be created and cached every time we hit-detect a cell
		// only the last segment of the path should be computed here
		// draw the path of the pattern (unless we are in stealth mode)
		final boolean drawPath = ((!mInStealthMode && mPatternDisplayMode != DisplayMode.Wrong)
		\|\| (mPatternDisplayMode == DisplayMode.Wrong && mShowErrorPath));
		final boolean drawWrongPath = mPatternDisplayMode == DisplayMode.Wrong && mShowErrorPath;
		final boolean drawPath = (!mInStealthMode && mPatternDisplayMode != DisplayMode.Wrong)
		\|\| drawWrongPath;

		if (drawPath) {
		mPathPaint.setColor(getCurrentColor(true /* partOfPattern */));
		@@ -1246,14 +1242,14 @@ 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);
		if (mFadePattern) {
		if (mFadePattern && !drawWrongPath) {
		mPathPaint.setAlpha((int) 255 - lineFadeVal );
		} else {
		mPathPaint.setAlpha(255);
		}
		} else {
		currentPath.lineTo(centerX, centerY);
		if (mFadePattern) {
		if (mFadePattern && !drawWrongPath) {
		mPathPaint.setAlpha((int) 255 - lineFadeVal );
		} else {
		mPathPaint.setAlpha(255);

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+10 −6

Original line number	Diff line number	Diff line
		@@ -53,6 +53,7 @@ import android.os.SystemProperties;
		import android.os.Trace;
		import android.os.UserHandle;
		import android.os.UserManager;
		import android.os.storage.StorageManager;
		import android.provider.Settings;
		import android.telephony.SubscriptionManager;
		import android.telephony.TelephonyManager;
		@@ -1075,6 +1076,8 @@ public class KeyguardViewMediator extends SystemUI {
		if (DEBUG) Log.d(TAG, "isKeyguardDisabled: keyguard is disabled by setting");
		return true;
		}
		if (!StorageManager.isFileEncryptedNativeOrEmulated() \|\|
		StorageManager.isUserKeyUnlocked(userId)) {
		if (mProfileManager != null) {
		Profile profile = mProfileManager.getActiveProfile();
		if (profile != null) {
		@@ -1084,6 +1087,7 @@ public class KeyguardViewMediator extends SystemUI {
		}
		}
		}
		}
		return false;
		}