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

Merge "Fix password field focus in keyguard" into jb-mr1.1-dev

Browse Source
This commit is contained in:
Jim Miller
2012-12-05 16:37:51 -08:00
committed by Android (Google) Code Review
parent 0db59a856f 42df15e93d
commit 9819a61745
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java
View File

@@ -287,11 +287,6 @@ public class KeyguardHostView extends KeyguardViewBase {
showPrimarySecurityScreen(false);
updateSecurityViews();
// Make sure at least this view is focusable in case nothing below it is. Otherwise,
// requestFocus() on this view will fail and allow events, such as volume keys, to be
// handled by the fallback handler. See bug 7546960 for details.
setFocusableInTouchMode(true);
}
private boolean shouldEnableAddWidget() {

17
policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewManager.java
View File

@@ -153,11 +153,18 @@ public class KeyguardViewManager {
@Override
public boolean dispatchKeyEvent(KeyEvent event) {
if (event.getAction() == KeyEvent.ACTION_DOWN && mKeyguardView != null) {
int keyCode = event.getKeyCode();
if (keyCode == KeyEvent.KEYCODE_BACK && mKeyguardView.handleBackKey()) {
return true;
} else if (keyCode == KeyEvent.KEYCODE_MENU && mKeyguardView.handleMenuKey()) {
if (mKeyguardView != null) {
// Always process back and menu keys, regardless of focus
if (event.getAction() == KeyEvent.ACTION_DOWN) {
int keyCode = event.getKeyCode();
if (keyCode == KeyEvent.KEYCODE_BACK && mKeyguardView.handleBackKey()) {
return true;
} else if (keyCode == KeyEvent.KEYCODE_MENU && mKeyguardView.handleMenuKey()) {
return true;
}
}
// Always process media keys, regardless of focus
if (mKeyguardView.dispatchKeyEvent(event)) {
return true;
}
}