| commit | 818301b543ffb47676513e98d786b4e310bfc489 | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Thu May 22 20:52:07 2014 +0200 |
| committer | Adrian Roos <roosa@google.com> | Fri May 23 14:38:34 2014 +0200 |
| tree | b2c0ac06998ac7a8f68513743dea8e09aeb6ce4e | |
| parent | 4f7884542ce8fba5bfed01ed834a32e6d3e2dea5 [diff] |
Remove unnecessary layout request from Keyguard Reverts the fix for 7137389 that does no longer apply after the architectural change of Keyguard and SystemUI. Bug: 15088101 Change-Id: Ic9234a9e69363b65b6e121eab498cb8d74660c91
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 d8e1766..6336cf7 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java
@@ -64,7 +64,6 @@ // Keyguard. If we need to authenticate, show the bouncer. if (!mKeyguardView.dismiss()) { mRoot.setVisibility(View.VISIBLE); - mKeyguardView.requestFocus(); mKeyguardView.onResume(); } }