diff options
author | Dave Mankoff <mankoff@google.com> | 2020-09-22 00:24:04 +0000 |
---|---|---|
committer | Dave Mankoff <mankoff@google.com> | 2020-09-22 13:25:57 +0000 |
commit | bdc667325a33a41cc51fe2f09b80f7269f17ac64 (patch) | |
tree | b0ecd67af069efe1408ff5112251b72b98949ae5 /packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputViewController.java | |
parent | dd7312c20ad29c133a32ffd170919bec5f98f215 (diff) |
Revert "7/N controllers for remaining Keyguard Password Views."
Revert submission 12585643-b166448040-keyguard-message-area
Reason for revert: http://b/169081305 & http://b/169020145
Reverted Changes:
I6fa05012c:4/N Setup Controller fo KeyguardSecurityContainer....
Iecf265744:5/N Add KeyguardSecurityViewFlipperController.
I90ab99b2f:6/N Add Controller for KeyguardPatternView
I4b74eddd1:7/N controllers for remaining Keyguard Password Vi...
I805286374:8/N Remove View Injection from KeyguardMessageArea...
I362755980:9/N Clean Up Keyguard Class Structure
Change-Id: I55c250121c2e234a41b30f2d647c44f6cb631028
Fixes: 169081305
Fixes: 169020145
Diffstat (limited to 'packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputViewController.java')
-rw-r--r-- | packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputViewController.java | 113 |
1 files changed, 0 insertions, 113 deletions
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputViewController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputViewController.java deleted file mode 100644 index 4d0ebfffbe04..000000000000 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputViewController.java +++ /dev/null @@ -1,113 +0,0 @@ -/* - * Copyright (C) 2020 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.keyguard; - -import android.view.KeyEvent; -import android.view.MotionEvent; -import android.view.View; -import android.view.View.OnKeyListener; -import android.view.View.OnTouchListener; - -import com.android.internal.util.LatencyTracker; -import com.android.internal.widget.LockPatternUtils; -import com.android.keyguard.KeyguardSecurityModel.SecurityMode; -import com.android.systemui.R; - -public abstract class KeyguardPinBasedInputViewController<T extends KeyguardPinBasedInputView> - extends KeyguardAbsKeyInputViewController<T> { - - private final LiftToActivateListener mLiftToActivateListener; - protected PasswordTextView mPasswordEntry; - - private final OnKeyListener mOnKeyListener = (v, keyCode, event) -> { - if (event.getAction() == KeyEvent.ACTION_DOWN) { - return mView.onKeyDown(keyCode, event); - } - return false; - }; - - private final OnTouchListener mOnTouchListener = (v, event) -> { - if (event.getActionMasked() == MotionEvent.ACTION_DOWN) { - mView.doHapticKeyClick(); - } - return false; - }; - - protected KeyguardPinBasedInputViewController(T view, - KeyguardUpdateMonitor keyguardUpdateMonitor, - SecurityMode securityMode, - LockPatternUtils lockPatternUtils, - KeyguardSecurityCallback keyguardSecurityCallback, - KeyguardMessageAreaController.Factory messageAreaControllerFactory, - LatencyTracker latencyTracker, - LiftToActivateListener liftToActivateListener) { - super(view, keyguardUpdateMonitor, securityMode, lockPatternUtils, keyguardSecurityCallback, - messageAreaControllerFactory, latencyTracker); - mLiftToActivateListener = liftToActivateListener; - mPasswordEntry = mView.findViewById(mView.getPasswordTextViewId()); - } - - @Override - protected void onViewAttached() { - super.onViewAttached(); - - mPasswordEntry.setOnKeyListener(mOnKeyListener); - mPasswordEntry.setUserActivityListener(this::onUserInput); - - View deleteButton = mView.findViewById(R.id.delete_button); - deleteButton.setOnTouchListener(mOnTouchListener); - deleteButton.setOnClickListener(v -> { - // check for time-based lockouts - if (mPasswordEntry.isEnabled()) { - mPasswordEntry.deleteLastChar(); - } - }); - deleteButton.setOnLongClickListener(v -> { - // check for time-based lockouts - if (mPasswordEntry.isEnabled()) { - mView.resetPasswordText(true /* animate */, true /* announce */); - } - mView.doHapticKeyClick(); - return true; - }); - - View okButton = mView.findViewById(R.id.key_enter); - if (okButton != null) { - okButton.setOnTouchListener(mOnTouchListener); - okButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (mPasswordEntry.isEnabled()) { - verifyPasswordAndUnlock(); - } - } - }); - okButton.setOnHoverListener(mLiftToActivateListener); - } - } - - @Override - public void onResume(int reason) { - super.onResume(reason); - mPasswordEntry.requestFocus(); - } - - @Override - void resetState() { - mView.setPasswordEntryEnabled(true); - } -} |