diff --git a/policy/src/com/android/internal/policy/impl/KeyguardViewBase.java b/policy/src/com/android/internal/policy/impl/KeyguardViewBase.java index 74dde9c93f5d2..59b546ddecfe6 100644 --- a/policy/src/com/android/internal/policy/impl/KeyguardViewBase.java +++ b/policy/src/com/android/internal/policy/impl/KeyguardViewBase.java @@ -98,6 +98,11 @@ public abstract class KeyguardViewBase extends FrameLayout { */ abstract public void onScreenTurnedOn(); + /** + * Called when the view needs to be shown. + */ + abstract public void show(); + /** * Called when a key has woken the device to give us a chance to adjust our * state according the the key. We are responsible for waking the device diff --git a/policy/src/com/android/internal/policy/impl/KeyguardViewManager.java b/policy/src/com/android/internal/policy/impl/KeyguardViewManager.java index f15812b273901..90972da1b591d 100644 --- a/policy/src/com/android/internal/policy/impl/KeyguardViewManager.java +++ b/policy/src/com/android/internal/policy/impl/KeyguardViewManager.java @@ -167,7 +167,7 @@ public class KeyguardViewManager implements KeyguardWindowController { mKeyguardHost.addView(mKeyguardView, lp); if (mScreenOn) { - mKeyguardView.onScreenTurnedOn(); + mKeyguardView.show(); } } diff --git a/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java b/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java index f24991c524e6a..325dfd3922e4d 100644 --- a/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java +++ b/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java @@ -512,11 +512,7 @@ public class LockPatternKeyguardView extends KeyguardViewBase implements Handler @Override public void onScreenTurnedOn() { mScreenOn = true; - if (mMode == Mode.LockScreen) { - ((KeyguardScreen) mLockScreen).onResume(); - } else { - ((KeyguardScreen) mUnlockScreen).onResume(); - } + show(); // When screen is turned on, need to bind to FaceLock service if we are using FaceLock // But only if not dealing with a call @@ -527,6 +523,15 @@ public class LockPatternKeyguardView extends KeyguardViewBase implements Handler } } + @Override + public void show() { + if (mMode == Mode.LockScreen) { + ((KeyguardScreen) mLockScreen).onResume(); + } else { + ((KeyguardScreen) mUnlockScreen).onResume(); + } + } + private void recreateLockScreen() { if (mLockScreen != null) { ((KeyguardScreen) mLockScreen).onPause();