resolved conflicts for merge of 1a783be3 to master (76b2337c) · Commits · e / os / android_frameworks_base

policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java

+9 −4

Original line number	Diff line number	Diff line
		@@ -564,9 +564,12 @@ public class LockPatternKeyguardView extends KeyguardViewBase implements Handler
		mForgotPattern = false;
		mHasOverlay = mUpdateMonitor.getPhoneState() != TelephonyManager.CALL_STATE_IDLE \|\|
		mHasDialog;
		if (mMode == Mode.LockScreen) {

		// Emulate activity life-cycle for both lock and unlock screen.
		if (mLockScreen != null) {
		((KeyguardScreen) mLockScreen).onPause();
		} else {
		}
		if (mUnlockScreen != null) {
		((KeyguardScreen) mUnlockScreen).onPause();
		}

		@@ -658,9 +661,11 @@ public class LockPatternKeyguardView extends KeyguardViewBase implements Handler

		@Override
		public void show() {
		if (mMode == Mode.LockScreen) {
		// Emulate activity life-cycle for both lock and unlock screen.
		if (mLockScreen != null) {
		((KeyguardScreen) mLockScreen).onResume();
		} else {
		}
		if (mUnlockScreen != null) {
		((KeyguardScreen) mUnlockScreen).onResume();
		}

+3 −0

Original line number	Diff line number	Diff line
		@@ -383,6 +383,9 @@ public class SimPukUnlockScreen extends LinearLayout implements KeyguardScreen,

		public void onClick(View v) {
		if (v == mCancelButton) {
		// clear the PIN/PUK entry fields if the user cancels
		mPinText.setText("");
		mPukText.setText("");
		mCallback.goToLockScreen();
		return;
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -359,6 +359,7 @@ public class SimUnlockScreen extends LinearLayout implements KeyguardScreen, Vie

		public void onClick(View v) {
		if (v == mCancelButton) {
		mPinText.setText(""); // clear the PIN entry field if the user cancels
		mCallback.goToLockScreen();
		return;
		}