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	Diff line number	Diff line
		@@ -110,8 +110,8 @@ public class KeyguardHostView extends KeyguardViewBase {
		}

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

+4 −3

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

		@Override
		public boolean dispatchTouchEvent(MotionEvent ev) {
		boolean result = super.dispatchTouchEvent(ev);
		public boolean onTouchEvent(MotionEvent ev) {
		boolean result = super.onTouchEvent(ev);
		// 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.
		final long elapsed = SystemClock.elapsedRealtime() - mLastPokeTime;
		@@ -237,10 +237,11 @@ public class KeyguardPatternView extends GridLayout implements KeyguardSecurityV

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

+2 −2

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

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

+1 −2

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

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

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