Merge "Fix wrong pattern count in keyguard pattern security view." into jb-mr1-dev (5d8d169b) · Commits · e / os / android_frameworks_base

policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -110,8 +110,8 @@ public class KeyguardHostView extends KeyguardViewBase {
	}		}

	@Override		@Override
	public boolean dispatchTouchEvent(MotionEvent ev) {		public boolean onTouchEvent(MotionEvent ev) {
	boolean result = super.dispatchTouchEvent(ev);		boolean result = super.onTouchEvent(ev);
	mTempRect.set(0, 0, 0, 0);		mTempRect.set(0, 0, 0, 0);
	offsetRectIntoDescendantCoords(mSecurityViewContainer, mTempRect);		offsetRectIntoDescendantCoords(mSecurityViewContainer, mTempRect);
	ev.offsetLocation(mTempRect.left, mTempRect.top);		ev.offsetLocation(mTempRect.left, mTempRect.top);

policy/src/com/android/internal/policy/impl/keyguard/KeyguardPatternView.java

+4 −3

Original line number	Original line	Diff line number	Diff line
	@@ -157,8 +157,8 @@ public class KeyguardPatternView extends GridLayout implements KeyguardSecurityV
	}		}

	@Override		@Override
	public boolean dispatchTouchEvent(MotionEvent ev) {		public boolean onTouchEvent(MotionEvent ev) {
	boolean result = super.dispatchTouchEvent(ev);		boolean result = super.onTouchEvent(ev);
	// as long as the user is entering a pattern (i.e sending a touch event that was handled		// as long as the user is entering a pattern (i.e sending a touch event that was handled
	// by this screen), keep poking the wake lock so that the screen will stay on.		// by this screen), keep poking the wake lock so that the screen will stay on.
	final long elapsed = SystemClock.elapsedRealtime() - mLastPokeTime;		final long elapsed = SystemClock.elapsedRealtime() - mLastPokeTime;
	@@ -237,10 +237,11 @@ public class KeyguardPatternView extends GridLayout implements KeyguardSecurityV

	public void onPatternDetected(List<LockPatternView.Cell> pattern) {		public void onPatternDetected(List<LockPatternView.Cell> pattern) {
	if (mLockPatternUtils.checkPattern(pattern)) {		if (mLockPatternUtils.checkPattern(pattern)) {
			mCallback.reportSuccessfulUnlockAttempt();
	mLockPatternView.setDisplayMode(LockPatternView.DisplayMode.Correct);		mLockPatternView.setDisplayMode(LockPatternView.DisplayMode.Correct);
	mCallback.dismiss(true); // keyguardDone(true)
	KeyStore.getInstance().password(LockPatternUtils.patternToString(pattern));		KeyStore.getInstance().password(LockPatternUtils.patternToString(pattern));
	mTotalFailedPatternAttempts = 0;		mTotalFailedPatternAttempts = 0;
			mCallback.dismiss(true);
	} else {		} else {
	if (pattern.size() > MIN_PATTERN_BEFORE_POKE_WAKELOCK) {		if (pattern.size() > MIN_PATTERN_BEFORE_POKE_WAKELOCK) {
	mCallback.userActivity(UNLOCK_PATTERN_WAKE_INTERVAL_MS);		mCallback.userActivity(UNLOCK_PATTERN_WAKE_INTERVAL_MS);

policy/src/com/android/internal/policy/impl/keyguard/KeyguardSecurityViewFlipper.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -40,8 +40,8 @@ public class KeyguardSecurityViewFlipper extends ViewFlipper {
	}		}

	@Override		@Override
	public boolean dispatchTouchEvent(MotionEvent ev) {		public boolean onTouchEvent(MotionEvent ev) {
	boolean result = super.dispatchTouchEvent(ev);		boolean result = super.onTouchEvent(ev);
	mTempRect.set(0, 0, 0, 0);		mTempRect.set(0, 0, 0, 0);
	for (int i = 0; i < getChildCount(); i++) {		for (int i = 0; i < getChildCount(); i++) {
	View child = getChildAt(i);		View child = getChildAt(i);

policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewManager.java

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -131,8 +131,7 @@ public class KeyguardViewManager {
	mKeyguardHost = new ViewManagerHost(mContext);		mKeyguardHost = new ViewManagerHost(mContext);

	int flags = WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN		int flags = WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN
	\| WindowManager.LayoutParams.FLAG_SHOW_WALLPAPER		\| WindowManager.LayoutParams.FLAG_SHOW_WALLPAPER;
	\| WindowManager.LayoutParams.FLAG_SLIPPERY;

	if (!mNeedsInput) {		if (!mNeedsInput) {
	flags \|= WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM;		flags \|= WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM;