Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Improved vibration feedback completely" into nyc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-08-03 00:57:52 +00:00
committed by Android (Google) Code Review
parent 1c21fc5e0a 0fc298ffc7
commit c9682ab5b5
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/Keyguard/src/com/android/keyguard/KeyguardPinBasedInputView.java
View File

@@ -20,13 +20,14 @@ import android.content.Context;
import android.graphics.Rect; import android.graphics.Rect;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.view.KeyEvent; import android.view.KeyEvent;
import android.view.MotionEvent;
import android.view.View; import android.view.View;
/** /**
* A Pin based Keyguard input view * A Pin based Keyguard input view
*/ */
public abstract class KeyguardPinBasedInputView extends KeyguardAbsKeyInputView public abstract class KeyguardPinBasedInputView extends KeyguardAbsKeyInputView
implements View.OnKeyListener { implements View.OnKeyListener, View.OnTouchListener {
protected PasswordTextView mPasswordEntry; protected PasswordTextView mPasswordEntry;
private View mOkButton; private View mOkButton;
@@ -185,10 +186,10 @@ public abstract class KeyguardPinBasedInputView extends KeyguardAbsKeyInputView
mOkButton = findViewById(R.id.key_enter); mOkButton = findViewById(R.id.key_enter);
if (mOkButton != null) { if (mOkButton != null) {
mOkButton.setOnTouchListener(this);
mOkButton.setOnClickListener(new View.OnClickListener() { mOkButton.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
doHapticKeyClick();
if (mPasswordEntry.isEnabled()) { if (mPasswordEntry.isEnabled()) {
verifyPasswordAndUnlock(); verifyPasswordAndUnlock();
} }
@@ -199,6 +200,7 @@ public abstract class KeyguardPinBasedInputView extends KeyguardAbsKeyInputView
mDeleteButton = findViewById(R.id.delete_button); mDeleteButton = findViewById(R.id.delete_button);
mDeleteButton.setVisibility(View.VISIBLE); mDeleteButton.setVisibility(View.VISIBLE);
mDeleteButton.setOnTouchListener(this);
mDeleteButton.setOnClickListener(new OnClickListener() { mDeleteButton.setOnClickListener(new OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
@@ -206,7 +208,6 @@ public abstract class KeyguardPinBasedInputView extends KeyguardAbsKeyInputView
if (mPasswordEntry.isEnabled()) { if (mPasswordEntry.isEnabled()) {
mPasswordEntry.deleteLastChar(); mPasswordEntry.deleteLastChar();
} }
doHapticKeyClick();
} }
}); });
mDeleteButton.setOnLongClickListener(new View.OnLongClickListener() { mDeleteButton.setOnLongClickListener(new View.OnLongClickListener() {
@@ -236,6 +237,14 @@ public abstract class KeyguardPinBasedInputView extends KeyguardAbsKeyInputView
super.onFinishInflate(); super.onFinishInflate();
} }
@Override
public boolean onTouch(View v, MotionEvent event) {
if (event.getActionMasked() == MotionEvent.ACTION_DOWN) {
doHapticKeyClick();
}
return false;
}
@Override @Override
public boolean onKey(View v, int keyCode, KeyEvent event) { public boolean onKey(View v, int keyCode, KeyEvent event) {
if (event.getAction() == KeyEvent.ACTION_DOWN) { if (event.getAction() == KeyEvent.ACTION_DOWN) {