diff --git a/packages/SystemUI/res/anim/error_to_trustedstate_ellipse_path_1_animation.xml b/packages/SystemUI/res/anim/error_to_trustedstate_ellipse_path_1_animation.xml new file mode 100755 index 0000000000000..1c501658a2eb5 --- /dev/null +++ b/packages/SystemUI/res/anim/error_to_trustedstate_ellipse_path_1_animation.xml @@ -0,0 +1,46 @@ + + + + + + + + diff --git a/packages/SystemUI/res/anim/error_to_trustedstate_ellipse_path_2_animation.xml b/packages/SystemUI/res/anim/error_to_trustedstate_ellipse_path_2_animation.xml new file mode 100755 index 0000000000000..598255cb8397d --- /dev/null +++ b/packages/SystemUI/res/anim/error_to_trustedstate_ellipse_path_2_animation.xml @@ -0,0 +1,49 @@ + + + + + + + + + + diff --git a/packages/SystemUI/res/anim/error_to_trustedstate_exclamation_dot_animation.xml b/packages/SystemUI/res/anim/error_to_trustedstate_exclamation_dot_animation.xml new file mode 100755 index 0000000000000..7e0fa437f7195 --- /dev/null +++ b/packages/SystemUI/res/anim/error_to_trustedstate_exclamation_dot_animation.xml @@ -0,0 +1,59 @@ + + + + + + + + + + + + + diff --git a/packages/SystemUI/res/anim/error_to_trustedstate_lock_left_side_animation.xml b/packages/SystemUI/res/anim/error_to_trustedstate_lock_left_side_animation.xml new file mode 100755 index 0000000000000..f413cbf87c304 --- /dev/null +++ b/packages/SystemUI/res/anim/error_to_trustedstate_lock_left_side_animation.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + diff --git a/packages/SystemUI/res/anim/error_to_trustedstate_lock_right_side_animation.xml b/packages/SystemUI/res/anim/error_to_trustedstate_lock_right_side_animation.xml new file mode 100755 index 0000000000000..f413cbf87c304 --- /dev/null +++ b/packages/SystemUI/res/anim/error_to_trustedstate_lock_right_side_animation.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + diff --git a/packages/SystemUI/res/anim/error_to_trustedstate_lock_top_animation.xml b/packages/SystemUI/res/anim/error_to_trustedstate_lock_top_animation.xml new file mode 100755 index 0000000000000..2518041f3c1ac --- /dev/null +++ b/packages/SystemUI/res/anim/error_to_trustedstate_lock_top_animation.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + diff --git a/packages/SystemUI/res/anim/error_to_trustedstate_path_1_animation.xml b/packages/SystemUI/res/anim/error_to_trustedstate_path_1_animation.xml new file mode 100755 index 0000000000000..15f8d2ec3e424 --- /dev/null +++ b/packages/SystemUI/res/anim/error_to_trustedstate_path_1_animation.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + diff --git a/packages/SystemUI/res/anim/error_to_trustedstate_path_2_animation.xml b/packages/SystemUI/res/anim/error_to_trustedstate_path_2_animation.xml new file mode 100755 index 0000000000000..aa81fcff0da5d --- /dev/null +++ b/packages/SystemUI/res/anim/error_to_trustedstate_path_2_animation.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + diff --git a/packages/SystemUI/res/anim/error_to_trustedstate_path_3_animation.xml b/packages/SystemUI/res/anim/error_to_trustedstate_path_3_animation.xml new file mode 100755 index 0000000000000..f94fe0a96974e --- /dev/null +++ b/packages/SystemUI/res/anim/error_to_trustedstate_path_3_animation.xml @@ -0,0 +1,49 @@ + + + + + + + + + + diff --git a/packages/SystemUI/res/anim/error_to_trustedstate_rectangle_path_1_animation.xml b/packages/SystemUI/res/anim/error_to_trustedstate_rectangle_path_1_animation.xml new file mode 100755 index 0000000000000..bcc8c41774263 --- /dev/null +++ b/packages/SystemUI/res/anim/error_to_trustedstate_rectangle_path_1_animation.xml @@ -0,0 +1,32 @@ + + + + + + diff --git a/packages/SystemUI/res/anim/trusted_state_to_error_ellipse_path_1_animation.xml b/packages/SystemUI/res/anim/trusted_state_to_error_ellipse_path_1_animation.xml new file mode 100755 index 0000000000000..5cf48093a05e8 --- /dev/null +++ b/packages/SystemUI/res/anim/trusted_state_to_error_ellipse_path_1_animation.xml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + diff --git a/packages/SystemUI/res/anim/trusted_state_to_error_ellipse_path_2_animation.xml b/packages/SystemUI/res/anim/trusted_state_to_error_ellipse_path_2_animation.xml new file mode 100755 index 0000000000000..a387f97730d06 --- /dev/null +++ b/packages/SystemUI/res/anim/trusted_state_to_error_ellipse_path_2_animation.xml @@ -0,0 +1,39 @@ + + + + + + + diff --git a/packages/SystemUI/res/anim/trusted_state_to_error_exclamation_dot_animation.xml b/packages/SystemUI/res/anim/trusted_state_to_error_exclamation_dot_animation.xml new file mode 100755 index 0000000000000..7a9fb3b3372da --- /dev/null +++ b/packages/SystemUI/res/anim/trusted_state_to_error_exclamation_dot_animation.xml @@ -0,0 +1,59 @@ + + + + + + + + + + + + + diff --git a/packages/SystemUI/res/anim/trusted_state_to_error_lock_left_side_animation.xml b/packages/SystemUI/res/anim/trusted_state_to_error_lock_left_side_animation.xml new file mode 100755 index 0000000000000..2a4753a2287ac --- /dev/null +++ b/packages/SystemUI/res/anim/trusted_state_to_error_lock_left_side_animation.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + diff --git a/packages/SystemUI/res/anim/trusted_state_to_error_lock_right_side_animation.xml b/packages/SystemUI/res/anim/trusted_state_to_error_lock_right_side_animation.xml new file mode 100755 index 0000000000000..2a4753a2287ac --- /dev/null +++ b/packages/SystemUI/res/anim/trusted_state_to_error_lock_right_side_animation.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + diff --git a/packages/SystemUI/res/anim/trusted_state_to_error_lock_top_animation.xml b/packages/SystemUI/res/anim/trusted_state_to_error_lock_top_animation.xml new file mode 100755 index 0000000000000..1f601d34d9f75 --- /dev/null +++ b/packages/SystemUI/res/anim/trusted_state_to_error_lock_top_animation.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + diff --git a/packages/SystemUI/res/anim/trusted_state_to_error_path_1_animation.xml b/packages/SystemUI/res/anim/trusted_state_to_error_path_1_animation.xml new file mode 100755 index 0000000000000..7b9be5c7ddf92 --- /dev/null +++ b/packages/SystemUI/res/anim/trusted_state_to_error_path_1_animation.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + diff --git a/packages/SystemUI/res/anim/trusted_state_to_error_path_2_animation.xml b/packages/SystemUI/res/anim/trusted_state_to_error_path_2_animation.xml new file mode 100755 index 0000000000000..8eb0c62da690a --- /dev/null +++ b/packages/SystemUI/res/anim/trusted_state_to_error_path_2_animation.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + diff --git a/packages/SystemUI/res/anim/trusted_state_to_error_path_3_animation.xml b/packages/SystemUI/res/anim/trusted_state_to_error_path_3_animation.xml new file mode 100755 index 0000000000000..2e867449b2f3c --- /dev/null +++ b/packages/SystemUI/res/anim/trusted_state_to_error_path_3_animation.xml @@ -0,0 +1,39 @@ + + + + + + + diff --git a/packages/SystemUI/res/anim/trusted_state_to_error_rectangle_path_1_animation.xml b/packages/SystemUI/res/anim/trusted_state_to_error_rectangle_path_1_animation.xml new file mode 100755 index 0000000000000..46d571cac76d9 --- /dev/null +++ b/packages/SystemUI/res/anim/trusted_state_to_error_rectangle_path_1_animation.xml @@ -0,0 +1,32 @@ + + + + + + diff --git a/packages/SystemUI/res/drawable/error_to_trustedstate.xml b/packages/SystemUI/res/drawable/error_to_trustedstate.xml new file mode 100755 index 0000000000000..6211edf2a9de1 --- /dev/null +++ b/packages/SystemUI/res/drawable/error_to_trustedstate.xml @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/SystemUI/res/drawable/error_to_trustedstate_animation.xml b/packages/SystemUI/res/drawable/error_to_trustedstate_animation.xml new file mode 100755 index 0000000000000..6befe13a1a1a5 --- /dev/null +++ b/packages/SystemUI/res/drawable/error_to_trustedstate_animation.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + diff --git a/packages/SystemUI/res/drawable/trusted_state_to_error.xml b/packages/SystemUI/res/drawable/trusted_state_to_error.xml new file mode 100755 index 0000000000000..534a9a54c3ea1 --- /dev/null +++ b/packages/SystemUI/res/drawable/trusted_state_to_error.xml @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/SystemUI/res/drawable/trusted_state_to_error_animation.xml b/packages/SystemUI/res/drawable/trusted_state_to_error_animation.xml new file mode 100755 index 0000000000000..5686d541c6d3c --- /dev/null +++ b/packages/SystemUI/res/drawable/trusted_state_to_error_animation.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + diff --git a/packages/SystemUI/res/interpolator/error_to_trustedstate_animation_interpolator_0.xml b/packages/SystemUI/res/interpolator/error_to_trustedstate_animation_interpolator_0.xml new file mode 100755 index 0000000000000..262cb88b48ace --- /dev/null +++ b/packages/SystemUI/res/interpolator/error_to_trustedstate_animation_interpolator_0.xml @@ -0,0 +1,19 @@ + + + diff --git a/packages/SystemUI/res/interpolator/error_to_trustedstate_animation_interpolator_1.xml b/packages/SystemUI/res/interpolator/error_to_trustedstate_animation_interpolator_1.xml new file mode 100755 index 0000000000000..9ecee94bc915d --- /dev/null +++ b/packages/SystemUI/res/interpolator/error_to_trustedstate_animation_interpolator_1.xml @@ -0,0 +1,19 @@ + + + diff --git a/packages/SystemUI/res/interpolator/error_to_trustedstate_animation_interpolator_2.xml b/packages/SystemUI/res/interpolator/error_to_trustedstate_animation_interpolator_2.xml new file mode 100755 index 0000000000000..ae0b2d7740d59 --- /dev/null +++ b/packages/SystemUI/res/interpolator/error_to_trustedstate_animation_interpolator_2.xml @@ -0,0 +1,19 @@ + + + diff --git a/packages/SystemUI/res/interpolator/error_to_trustedstate_animation_interpolator_3.xml b/packages/SystemUI/res/interpolator/error_to_trustedstate_animation_interpolator_3.xml new file mode 100755 index 0000000000000..be7cc69ebda19 --- /dev/null +++ b/packages/SystemUI/res/interpolator/error_to_trustedstate_animation_interpolator_3.xml @@ -0,0 +1,19 @@ + + + diff --git a/packages/SystemUI/res/interpolator/error_to_trustedstate_animation_interpolator_4.xml b/packages/SystemUI/res/interpolator/error_to_trustedstate_animation_interpolator_4.xml new file mode 100755 index 0000000000000..f8f978d7dc067 --- /dev/null +++ b/packages/SystemUI/res/interpolator/error_to_trustedstate_animation_interpolator_4.xml @@ -0,0 +1,19 @@ + + + diff --git a/packages/SystemUI/res/interpolator/trusted_state_to_error_animation_interpolator_0.xml b/packages/SystemUI/res/interpolator/trusted_state_to_error_animation_interpolator_0.xml new file mode 100755 index 0000000000000..9ecee94bc915d --- /dev/null +++ b/packages/SystemUI/res/interpolator/trusted_state_to_error_animation_interpolator_0.xml @@ -0,0 +1,19 @@ + + + diff --git a/packages/SystemUI/res/interpolator/trusted_state_to_error_animation_interpolator_1.xml b/packages/SystemUI/res/interpolator/trusted_state_to_error_animation_interpolator_1.xml new file mode 100755 index 0000000000000..87ef1d49d6abb --- /dev/null +++ b/packages/SystemUI/res/interpolator/trusted_state_to_error_animation_interpolator_1.xml @@ -0,0 +1,19 @@ + + + diff --git a/packages/SystemUI/res/interpolator/trusted_state_to_error_animation_interpolator_2.xml b/packages/SystemUI/res/interpolator/trusted_state_to_error_animation_interpolator_2.xml new file mode 100755 index 0000000000000..be7cc69ebda19 --- /dev/null +++ b/packages/SystemUI/res/interpolator/trusted_state_to_error_animation_interpolator_2.xml @@ -0,0 +1,19 @@ + + + diff --git a/packages/SystemUI/res/interpolator/trusted_state_to_error_animation_interpolator_3.xml b/packages/SystemUI/res/interpolator/trusted_state_to_error_animation_interpolator_3.xml new file mode 100755 index 0000000000000..83af65a6e60e2 --- /dev/null +++ b/packages/SystemUI/res/interpolator/trusted_state_to_error_animation_interpolator_3.xml @@ -0,0 +1,19 @@ + + + diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java index 463abfc10266a..93ecb06f693d7 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java @@ -100,6 +100,8 @@ public class LockIcon extends KeyguardAffordanceView { // TODO: Real icon for facelock. int state = getState(); boolean anyFingerprintIcon = state == STATE_FINGERPRINT || state == STATE_FINGERPRINT_ERROR; + boolean useAdditionalPadding = anyFingerprintIcon; + boolean trustHidden = anyFingerprintIcon; if (state != mLastState || mDeviceInteractive != mLastDeviceInteractive || mScreenOn != mLastScreenOn) { boolean isAnim = true; @@ -107,6 +109,16 @@ public class LockIcon extends KeyguardAffordanceView { mDeviceInteractive, mLastScreenOn, mScreenOn); if (iconRes == R.drawable.lockscreen_fingerprint_draw_off_animation) { anyFingerprintIcon = true; + useAdditionalPadding = true; + trustHidden = true; + } else if (iconRes == R.drawable.trusted_state_to_error_animation) { + anyFingerprintIcon = true; + useAdditionalPadding = false; + trustHidden = true; + } else if (iconRes == R.drawable.error_to_trustedstate_animation) { + anyFingerprintIcon = true; + useAdditionalPadding = false; + trustHidden = false; } if (iconRes == -1) { iconRes = getIconForState(state, mScreenOn, mDeviceInteractive); @@ -124,7 +136,7 @@ public class LockIcon extends KeyguardAffordanceView { || icon.getIntrinsicWidth() != iconWidth)) { icon = new IntrinsicSizeDrawable(icon, iconWidth, iconHeight); } - setPaddingRelative(0, 0, 0, anyFingerprintIcon + setPaddingRelative(0, 0, 0, useAdditionalPadding ? getResources().getDimensionPixelSize( R.dimen.fingerprint_icon_additional_padding) : 0); @@ -145,7 +157,7 @@ public class LockIcon extends KeyguardAffordanceView { } // Hide trust circle when fingerprint is running. - boolean trustManaged = mUnlockMethodCache.isTrustManaged() && !anyFingerprintIcon; + boolean trustManaged = mUnlockMethodCache.isTrustManaged() && !trustHidden; mTrustDrawable.setTrustManaged(trustManaged); updateClickability(); } @@ -208,6 +220,10 @@ public class LockIcon extends KeyguardAffordanceView { boolean oldScreenOn, boolean screenOn) { if (oldState == STATE_FINGERPRINT && newState == STATE_FINGERPRINT_ERROR) { return R.drawable.lockscreen_fingerprint_fp_to_error_state_animation; + } else if (oldState == STATE_LOCK_OPEN && newState == STATE_FINGERPRINT_ERROR) { + return R.drawable.trusted_state_to_error_animation; + } else if (oldState == STATE_FINGERPRINT_ERROR && newState == STATE_LOCK_OPEN) { + return R.drawable.error_to_trustedstate_animation; } 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 @@ -225,10 +241,10 @@ public class LockIcon extends KeyguardAffordanceView { KeyguardUpdateMonitor updateMonitor = KeyguardUpdateMonitor.getInstance(mContext); boolean fingerprintRunning = updateMonitor.isFingerprintDetectionRunning(); boolean unlockingAllowed = updateMonitor.isUnlockingWithFingerprintAllowed(); - if (mUnlockMethodCache.canSkipBouncer()) { - return STATE_LOCK_OPEN; - } else if (mTransientFpError) { + if (mTransientFpError) { return STATE_FINGERPRINT_ERROR; + } else if (mUnlockMethodCache.canSkipBouncer()) { + return STATE_LOCK_OPEN; } else if (fingerprintRunning && unlockingAllowed) { return STATE_FINGERPRINT; } else if (mUnlockMethodCache.isFaceUnlockRunning()) {