From 818301b543ffb47676513e98d786b4e310bfc489 Mon Sep 17 00:00:00 2001 From: Adrian Roos Date: Thu, 22 May 2014 20:52:07 +0200 Subject: 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 --- packages/Keyguard/src/com/android/keyguard/KeyguardViewBase.java | 5 ----- .../src/com/android/systemui/statusbar/phone/KeyguardBouncer.java | 1 - 2 files changed, 6 deletions(-) (limited to 'packages') 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 @@ public abstract class KeyguardViewBase extends FrameLayout implements SecurityCa 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 @@ public class KeyguardBouncer { // Keyguard. If we need to authenticate, show the bouncer. if (!mKeyguardView.dismiss()) { mRoot.setVisibility(View.VISIBLE); - mKeyguardView.requestFocus(); mKeyguardView.onResume(); } } -- cgit v1.1