am 4fa27f31: am 80a90efc: Merge "Fix ring volume issue by addressing focus regression in keyguard." into jb-mr1.1-dev
* commit '4fa27f314038620fd3c50170d2f8caebeb6005bb':
Fix ring volume issue by addressing focus regression in keyguard.
diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java
index 8502d78..94cd0b5 100644
--- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java
+++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java
@@ -286,6 +286,11 @@
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() {
@@ -881,6 +886,7 @@
if (mViewStateManager != null) {
mViewStateManager.showUsabilityHints();
}
+ requestFocus();
}
@Override
@@ -900,6 +906,7 @@
if (cameraPage != null) {
cameraPage.onScreenTurnedOff();
}
+ clearFocus();
}
public void clearAppWidgetToShow() {
diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewManager.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewManager.java
index efd09e0..dac852a 100644
--- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewManager.java
+++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewManager.java
@@ -216,6 +216,7 @@
if (force || mKeyguardView == null) {
inflateKeyguardView(options);
+ mKeyguardView.requestFocus();
}
updateUserActivityTimeoutInWindowLayoutParams();
mViewManager.updateViewLayout(mKeyguardHost, mWindowLayoutParams);