diff options
| author | Dave Mankoff <mankoff@google.com> | 2020-09-23 14:01:33 +0000 |
|---|---|---|
| committer | Dave Mankoff <mankoff@google.com> | 2020-09-24 11:04:51 -0400 |
| commit | dc0193004485c8a2700ecd78fc2a907df6bd03ee (patch) | |
| tree | f406896b8712e8aa576271b0eb5a808e690e630b /packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java | |
| parent | 6350a9f10bdb3f72e89122bd16fe29341dd1cd05 (diff) | |
Revert^2 "7/N controllers for remaining Keyguard Password ..."
Revert submission 12656261-revert-12585643-b166448040-keyguard-message-area-NUUJOVRYJS
This also fixes the original issue introduced in this CL.
KeyguardAbsKeyInputViewController#reset would call mView#resetState
instead of its own internal resetState method. However, all the logic
from the various resetState methods had been moved from the views to
their controllers. Simply calling resetState direclty resolves the
issue (line 105 of KeyguardAbsKeyInputViewController).
Reason for revert: Fixing http://b/169231892 and http://b/169145796
Reverted Changes:
I7683b2234:Revert "4/N Setup Controller fo KeyguardSecurityCo...
I5cbe04c0c:Revert "5/N Add KeyguardSecurityViewFlipperControl...
I11dff38ad:Revert "6/N Add Controller for KeyguardPatternView...
I55c250121:Revert "7/N controllers for remaining Keyguard Pas...
Ie84234cb8:Revert "8/N Remove View Injection from KeyguardMes...
Ic62f199a5:Revert "9/N Clean Up Keyguard Class Structure"
Change-Id: Ie3669e0c9a23ffd4443ced0fb08ec754f1df55db
Fixes: 169145796
Diffstat (limited to 'packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java')
| -rw-r--r-- | packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java index 342f3de2ede3..2c7dce6e4302 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java @@ -197,6 +197,7 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard @Override public void init() { super.init(); + mSecurityViewFlipperController.init(); } @Override |