diff options
author | Adrian Roos <roosa@google.com> | 2014-05-21 13:10:23 +0200 |
---|---|---|
committer | Jorim Jaggi <jjaggi@google.com> | 2014-05-25 21:50:15 +0000 |
commit | 7d7090d66692170b0584a5b9f4fe3e47285ee615 (patch) | |
tree | 87afc8961ace693b8d69c022968b9f98de91b7e9 /packages/Keyguard | |
parent | 49a6e1b3213a6e9f06a3562c69f2878b120c5fb5 (diff) | |
download | frameworks_base-7d7090d66692170b0584a5b9f4fe3e47285ee615.zip frameworks_base-7d7090d66692170b0584a5b9f4fe3e47285ee615.tar.gz frameworks_base-7d7090d66692170b0584a5b9f4fe3e47285ee615.tar.bz2 |
DO NOT MERGE Only send notification activity intents after dismissing Keyguard
Defers delivery of contentIntent and activity actions until
the lockscreen has been dismissed, so that activities don't
launch beneath it.
Bug: 14491010
Change-Id: Ic8c61c18a75d4f0da2d82a0a8a038a5d98ebb71f
(cherry picked from commit 79f640dd0d02c1cc199937b160d8f7abd3c1eaeb)
Diffstat (limited to 'packages/Keyguard')
-rw-r--r-- | packages/Keyguard/src/com/android/keyguard/KeyguardHostView.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardHostView.java b/packages/Keyguard/src/com/android/keyguard/KeyguardHostView.java index 2685447..d2bf30c 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardHostView.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardHostView.java @@ -112,7 +112,9 @@ public class KeyguardHostView extends KeyguardViewBase { } public interface OnDismissAction { - /* returns true if the dismiss should be deferred */ + /** + * @return true if the dismiss should be deferred + */ boolean onDismiss(); } |