diff options
author | Andrew Lee <anwlee@google.com> | 2015-01-30 13:23:21 -0800 |
---|---|---|
committer | Andrew Lee <anwlee@google.com> | 2015-02-02 12:30:59 -0800 |
commit | 72b46d429cbab54af962c25ffe087c5f927f7340 (patch) | |
tree | b3329a688b367eddac23d554eeb7bf4ea676fed4 /packages/SystemUI | |
parent | c37fa833ada2981b479a7582010a173ff9adc5bf (diff) | |
download | frameworks_base-72b46d429cbab54af962c25ffe087c5f927f7340.zip frameworks_base-72b46d429cbab54af962c25ffe087c5f927f7340.tar.gz frameworks_base-72b46d429cbab54af962c25ffe087c5f927f7340.tar.bz2 |
Reset keyguard/bouncer on "return to call".
+ Add callback, to be invoked when EmergencyButton is clicked when
inside a call.
+ Route callback to the KeyguardViewMediator, to invoke
resetStateLocked() to reset the bouncer.
Bug: 18977746
Change-Id: I4733ccfb6809c4610184a33a28ba38ecf255231f
Diffstat (limited to 'packages/SystemUI')
-rw-r--r-- | packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java index 6df78ac..f3d214f 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java @@ -489,6 +489,11 @@ public class KeyguardViewMediator extends SystemUI { } @Override + public void resetKeyguard() { + resetStateLocked(); + } + + @Override public void playTrustedSound() { KeyguardViewMediator.this.playTrustedSound(); } |