diff options
author | Alec Mouri <alecmouri@google.com> | 2021-02-17 00:18:55 +0000 |
---|---|---|
committer | Dave Mankoff <mankoff@google.com> | 2021-02-18 11:39:15 -0500 |
commit | f23acf33ff3684586b7dc66026b518ada77eed84 (patch) | |
tree | 6bc6d3e0db9ade40b47a64f79f7b1ed068c58fd8 /packages/SystemUI/src/com/android/keyguard/KeyguardSecurityViewFlipperController.java | |
parent | 5f65ded5af704ad6f41716a635649e79b557bab8 (diff) |
Revert "Add Controller for Emergency Button."
Revert submission 13536242-b179775696-depenency-get-keyguard
Reason for revert: Candidate reversion for broken tests: b/180440298
Reverted Changes:
I6d0271692:Add ViewController to CarrierText.
I4d9a4a21f:Add Controller for Emergency Button.
I4c76d99f9:Remove Dependency.get from KeyguardSliceTextView.
I730593fcf:Add injection to ClockProvider.
Ifbb93e624:Remove Dependency.get from KeyguardStatusView.
I237215456:Remove final calls to Dependency.get from keyguard...
Change-Id: I7b46dbad24050cfe6a363131549169602fda1f13
Diffstat (limited to 'packages/SystemUI/src/com/android/keyguard/KeyguardSecurityViewFlipperController.java')
-rw-r--r-- | packages/SystemUI/src/com/android/keyguard/KeyguardSecurityViewFlipperController.java | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityViewFlipperController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityViewFlipperController.java index 33d47fe13f38..f1b504e9f941 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityViewFlipperController.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityViewFlipperController.java @@ -44,18 +44,15 @@ public class KeyguardSecurityViewFlipperController private final List<KeyguardInputViewController<KeyguardInputView>> mChildren = new ArrayList<>(); private final LayoutInflater mLayoutInflater; - private final EmergencyButtonController.Factory mEmergencyButtonControllerFactory; private final Factory mKeyguardSecurityViewControllerFactory; @Inject protected KeyguardSecurityViewFlipperController(KeyguardSecurityViewFlipper view, LayoutInflater layoutInflater, - KeyguardInputViewController.Factory keyguardSecurityViewControllerFactory, - EmergencyButtonController.Factory emergencyButtonControllerFactory) { + KeyguardInputViewController.Factory keyguardSecurityViewControllerFactory) { super(view); mKeyguardSecurityViewControllerFactory = keyguardSecurityViewControllerFactory; mLayoutInflater = layoutInflater; - mEmergencyButtonControllerFactory = emergencyButtonControllerFactory; } @Override @@ -114,8 +111,7 @@ public class KeyguardSecurityViewFlipperController if (childController == null) { childController = new NullKeyguardInputViewController( - securityMode, keyguardSecurityCallback, - mEmergencyButtonControllerFactory.create(null)); + securityMode, keyguardSecurityCallback); } return childController; @@ -144,9 +140,8 @@ public class KeyguardSecurityViewFlipperController private static class NullKeyguardInputViewController extends KeyguardInputViewController<KeyguardInputView> { protected NullKeyguardInputViewController(SecurityMode securityMode, - KeyguardSecurityCallback keyguardSecurityCallback, - EmergencyButtonController emergencyButtonController) { - super(null, securityMode, keyguardSecurityCallback, emergencyButtonController); + KeyguardSecurityCallback keyguardSecurityCallback) { + super(null, securityMode, keyguardSecurityCallback); } @Override |