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

am 0dfae079: am d5471a0b: Merge "Revert "Fixed accessibility for the pin input view on keyguard."" into lmp-mr1-dev

Browse Source 
* commit '0dfae079633764c3b6fceaea38fdc664e0e5a76d':
  Revert "Fixed accessibility for the pin input view on keyguard."
This commit is contained in:
Alan Viverette
2015-02-17 22:59:29 +00:00
committed by Android Git Automerger
parent 157c75e4b5 0dfae07963
commit 014442c28e
2 changed files with 21 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,11 +17,7 @@
package com.android.keyguard; package com.android.keyguard;
import android.content.Context; import android.content.Context;
import android.database.ContentObserver;
import android.graphics.Rect; import android.graphics.Rect;
import android.os.Handler;
import android.os.UserHandle;
import android.provider.Settings;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.view.KeyEvent; import android.view.KeyEvent;
import android.view.View; import android.view.View;
@@ -32,39 +28,19 @@ import android.view.View;
public abstract class KeyguardPinBasedInputView extends KeyguardAbsKeyInputView public abstract class KeyguardPinBasedInputView extends KeyguardAbsKeyInputView
implements View.OnKeyListener { implements View.OnKeyListener {
private final android.database.ContentObserver mSpeakPasswordObserver
= new ContentObserver(new Handler()) {
@Override
public void onChange(boolean selfChange) {
super.onChange(selfChange);
// Ensure that it's not called too early
if (mButton0 != null) {
mButton0.updateContentDescription();
mButton1.updateContentDescription();
mButton2.updateContentDescription();
mButton3.updateContentDescription();
mButton4.updateContentDescription();
mButton5.updateContentDescription();
mButton6.updateContentDescription();
mButton7.updateContentDescription();
mButton8.updateContentDescription();
mButton9.updateContentDescription();
}
}
};
protected PasswordTextView mPasswordEntry; protected PasswordTextView mPasswordEntry;
private View mOkButton; private View mOkButton;
private View mDeleteButton; private View mDeleteButton;
private NumPadKey mButton0; private View mButton0;
private NumPadKey mButton1; private View mButton1;
private NumPadKey mButton2; private View mButton2;
private NumPadKey mButton3; private View mButton3;
private NumPadKey mButton4; private View mButton4;
private NumPadKey mButton5; private View mButton5;
private NumPadKey mButton6; private View mButton6;
private NumPadKey mButton7; private View mButton7;
private NumPadKey mButton8; private View mButton8;
private NumPadKey mButton9; private View mButton9;
public KeyguardPinBasedInputView(Context context) { public KeyguardPinBasedInputView(Context context) {
this(context, null); this(context, null);
@@ -72,9 +48,6 @@ public abstract class KeyguardPinBasedInputView extends KeyguardAbsKeyInputView
public KeyguardPinBasedInputView(Context context, AttributeSet attrs) { public KeyguardPinBasedInputView(Context context, AttributeSet attrs) {
super(context, attrs); super(context, attrs);
context.getContentResolver().registerContentObserver(
Settings.Secure.getUriFor(Settings.Secure.ACCESSIBILITY_SPEAK_PASSWORD), true,
mSpeakPasswordObserver, UserHandle.USER_ALL);
} }
@Override @Override
@@ -215,16 +188,16 @@ public abstract class KeyguardPinBasedInputView extends KeyguardAbsKeyInputView
} }
}); });
mButton0 = (NumPadKey) findViewById(R.id.key0); mButton0 = findViewById(R.id.key0);
mButton1 = (NumPadKey) findViewById(R.id.key1); mButton1 = findViewById(R.id.key1);
mButton2 = (NumPadKey) findViewById(R.id.key2); mButton2 = findViewById(R.id.key2);
mButton3 = (NumPadKey) findViewById(R.id.key3); mButton3 = findViewById(R.id.key3);
mButton4 = (NumPadKey) findViewById(R.id.key4); mButton4 = findViewById(R.id.key4);
mButton5 = (NumPadKey) findViewById(R.id.key5); mButton5 = findViewById(R.id.key5);
mButton6 = (NumPadKey) findViewById(R.id.key6); mButton6 = findViewById(R.id.key6);
mButton7 = (NumPadKey) findViewById(R.id.key7); mButton7 = findViewById(R.id.key7);
mButton8 = (NumPadKey) findViewById(R.id.key8); mButton8 = findViewById(R.id.key8);
mButton9 = (NumPadKey) findViewById(R.id.key9); mButton9 = findViewById(R.id.key9);
mPasswordEntry.requestFocus(); mPasswordEntry.requestFocus();
super.onFinishInflate(); super.onFinishInflate();

23
packages/Keyguard/src/com/android/keyguard/NumPadKey.java
View File

@@ -22,8 +22,6 @@ import android.graphics.drawable.Drawable;
import android.os.Debug; import android.os.Debug;
import android.os.PowerManager; import android.os.PowerManager;
import android.os.SystemClock; import android.os.SystemClock;
import android.os.UserHandle;
import android.provider.Settings;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.view.HapticFeedbackConstants; import android.view.HapticFeedbackConstants;
import android.view.KeyEvent; import android.view.KeyEvent;
@@ -120,17 +118,7 @@ public class NumPadKey extends ViewGroup {
} }
setBackground(mContext.getDrawable(R.drawable.ripple_drawable)); setBackground(mContext.getDrawable(R.drawable.ripple_drawable));
updateContentDescription(); setContentDescription(mDigitText.getText().toString());
}
public void updateContentDescription() {
if (shouldSpeakPasswordsForAccessibility()) {
setContentDescription(
mDigitText.getText().toString() + mKlondikeText.getText().toString());
} else {
setContentDescription(getContext().getString(
com.android.internal.R.string.keyboard_password_character_no_headset));
}
} }
@Override @Override
@@ -164,15 +152,6 @@ public class NumPadKey extends ViewGroup {
mKlondikeText.layout(left, top, left + mKlondikeText.getMeasuredWidth(), bottom); mKlondikeText.layout(left, top, left + mKlondikeText.getMeasuredWidth(), bottom);
} }
/**
* @return true if the user has explicitly allowed accessibility services
* to speak passwords.
*/
private boolean shouldSpeakPasswordsForAccessibility() {
return (Settings.Secure.getIntForUser(mContext.getContentResolver(),
Settings.Secure.ACCESSIBILITY_SPEAK_PASSWORD, 0, UserHandle.USER_CURRENT) == 1);
}
@Override @Override
public boolean hasOverlappingRendering() { public boolean hasOverlappingRendering() {
return false; return false;