summaryrefslogtreecommitdiff
path: root/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java
diff options
context:
space:
mode:
authorBeverly Tai <beverlyt@google.com>2021-12-13 18:20:21 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2021-12-13 18:20:21 +0000
commita66bc891ceecbaea77d37b4e71643332d3e70251 (patch)
tree8df60d1947098b679103d9bf003e7cd0eb119fd2 /packages/SystemUI/src/com/android/keyguard/LockIconViewController.java
parent3b3e39f6271c9e9a301d6115fa481846df9d32d2 (diff)
parent4f069151212b6ab1b4d42d4907a799f5d7f349be (diff)
Merge "Add unlocked LS => locked AOD transition" into sc-v2-dev
Diffstat (limited to 'packages/SystemUI/src/com/android/keyguard/LockIconViewController.java')
-rw-r--r--packages/SystemUI/src/com/android/keyguard/LockIconViewController.java4
1 files changed, 0 insertions, 4 deletions
diff --git a/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java b/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java
index 7ac3ca629e3f..cc452c6f3b79 100644
--- a/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java
+++ b/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java
@@ -281,10 +281,6 @@ public class LockIconViewController extends ViewController<LockIconView> impleme
mView.setContentDescription(mUnlockedLabel);
mView.setVisibility(View.VISIBLE);
} else if (mShowAodLockIcon) {
- if (wasShowingUnlock) {
- // transition to the unlock icon first
- mView.updateIcon(ICON_LOCK, false);
- }
mView.updateIcon(ICON_LOCK, true);
mView.setContentDescription(mLockedLabel);
mView.setVisibility(View.VISIBLE);