Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2aaf06a4 authored Jul 17, 2015 by Selim Cinek Committed by Android Git Automerger Jul 17, 2015

am d8a090e7: am 4b385459: am 2a10ff08: am 60e15dae: Merge "Fixed a bug where a...

am d8a090e7: am 4b385459: am 2a10ff08: am 60e15dae: Merge "Fixed a bug where a fingerprint animation was not running" into mnc-dev

* commit 'd8a090e7':
  Fixed a bug where a fingerprint animation was not running

parents 4d2fb095 d8a090e7

packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -308,7 +308,8 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe
		boolean showNextSecurityScreenOrFinish(boolean authenticated) {
		if (DEBUG) Log.d(TAG, "showNextSecurityScreenOrFinish(" + authenticated + ")");
		boolean finish = false;
		if (mUpdateMonitor.getUserHasTrust(KeyguardUpdateMonitor.getCurrentUser())) {
		if (mUpdateMonitor.getUserCanSkipBouncer(
		KeyguardUpdateMonitor.getCurrentUser())) {
		finish = true;
		} else if (SecurityMode.None == mCurrentSecuritySelection) {
		SecurityMode securityMode = mSecurityModel.getSecurityMode();

packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java

+5 −2

Original line number	Diff line number	Diff line
		@@ -497,9 +497,12 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
		& DevicePolicyManager.KEYGUARD_DISABLE_FINGERPRINT) != 0;
		}

		public boolean getUserCanSkipBouncer(int userId) {
		return getUserHasTrust(userId) \|\| mUserFingerprintAuthenticated.get(userId);
		}

		public boolean getUserHasTrust(int userId) {
		return !isTrustDisabled(userId) && mUserHasTrust.get(userId)
		\|\| mUserFingerprintAuthenticated.get(userId);
		return !isTrustDisabled(userId) && mUserHasTrust.get(userId);
		}

		public boolean getUserTrustIsManaged(int userId) {

packages/SystemUI/src/com/android/systemui/qs/tiles/CastTile.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -92,7 +92,8 @@ public class CastTile extends QSTile<QSTile.BooleanState> {

		@Override
		protected void handleUpdateState(BooleanState state, Object arg) {
		state.visible = !(mKeyguard.isSecure() && mKeyguard.isShowing() && !mKeyguard.isTrusted());
		state.visible = !mKeyguard.isSecure() \|\| !mKeyguard.isShowing()
		\|\| mKeyguard.canSkipBouncer();
		state.label = mContext.getString(R.string.quick_settings_cast_title);
		state.value = false;
		state.autoMirrorDrawable = false;

packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -252,10 +252,10 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL

		private Intent getCameraIntent() {
		KeyguardUpdateMonitor updateMonitor = KeyguardUpdateMonitor.getInstance(mContext);
		boolean currentUserHasTrust = updateMonitor.getUserHasTrust(
		boolean canSkipBouncer = updateMonitor.getUserCanSkipBouncer(
		KeyguardUpdateMonitor.getCurrentUser());
		boolean secure = mLockPatternUtils.isSecure(KeyguardUpdateMonitor.getCurrentUser());
		return (secure && !currentUserHasTrust) ? SECURE_CAMERA_INTENT : INSECURE_CAMERA_INTENT;
		return (secure && !canSkipBouncer) ? SECURE_CAMERA_INTENT : INSECURE_CAMERA_INTENT;
		}

		private void updateCameraVisibility() {

packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -214,7 +214,7 @@ public class LockIcon extends KeyguardAffordanceView {
		} else if (oldState == STATE_FINGERPRINT_ERROR && newState == STATE_FINGERPRINT) {
		return R.drawable.lockscreen_fingerprint_error_state_to_fp_animation;
		} else if (oldState == STATE_FINGERPRINT && newState == STATE_LOCK_OPEN
		&& !mUnlockMethodCache.isCurrentlyInsecure()) {
		&& !mUnlockMethodCache.isTrusted()) {
		return R.drawable.lockscreen_fingerprint_draw_off_animation;
		} else if (newState == STATE_FINGERPRINT && !oldScreenOn && screenOn) {
		return R.drawable.lockscreen_fingerprint_draw_on_animation;
		@@ -226,7 +226,7 @@ public class LockIcon extends KeyguardAffordanceView {
		private int getState() {
		boolean fingerprintRunning =
		KeyguardUpdateMonitor.getInstance(mContext).isFingerprintDetectionRunning();
		if (mUnlockMethodCache.isCurrentlyInsecure()) {
		if (mUnlockMethodCache.canSkipBouncer()) {
		return STATE_LOCK_OPEN;
		} else if (mTransientFpError) {
		return STATE_FINGERPRINT_ERROR;