| commit | b13d754898eee54876799b3a306ff6fa453acfda | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Mon May 26 13:03:07 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon May 26 13:03:09 2014 +0000 |
| tree | 0b88a01ac1a9c5d46e45f84d05d54e41b7a8f8f0 | |
| parent | 7d7090d66692170b0584a5b9f4fe3e47285ee615 [diff] | |
| parent | 818301b543ffb47676513e98d786b4e310bfc489 [diff] |
Merge "Remove unnecessary layout request from Keyguard" into lmp-preview-dev
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardViewBase.java b/packages/Keyguard/src/com/android/keyguard/KeyguardViewBase.java index a9206e7..48b7be9 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardViewBase.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardViewBase.java
@@ -237,11 +237,6 @@ if (DEBUG) Log.d(TAG, "screen on, instance " + Integer.toHexString(hashCode())); mSecurityContainer.showPrimarySecurityScreen(false); mSecurityContainer.onResume(KeyguardSecurityView.SCREEN_ON); - - // This is a an attempt to fix bug 7137389 where the device comes back on but the entire - // layout is blank but forcing a layout causes it to reappear (e.g. with with - // hierarchyviewer). - requestLayout(); requestFocus(); }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java index 9138867..2fa2a00 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java
@@ -65,7 +65,6 @@ // Keyguard. If we need to authenticate, show the bouncer. if (!mKeyguardView.dismiss()) { mRoot.setVisibility(View.VISIBLE); - mKeyguardView.requestFocus(); mKeyguardView.onResume(); } }