diff options
| author | Jeff Brown <jeffbrown@google.com> | 2010-10-15 18:40:39 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-15 18:40:39 -0700 |
| commit | 6ba052b4847d85831c38c9b8e2942cef4987e55b (patch) | |
| tree | aa693582c047451f74ad1e45943684cde1f314ed /core | |
| parent | bce520e6460e712c0985f12cf212e2d72fd1b9e4 (diff) | |
| parent | c1a564b108c511c0bdd699567c245b031930e718 (diff) | |
| download | frameworks_base-6ba052b4847d85831c38c9b8e2942cef4987e55b.zip frameworks_base-6ba052b4847d85831c38c9b8e2942cef4987e55b.tar.gz frameworks_base-6ba052b4847d85831c38c9b8e2942cef4987e55b.tar.bz2 | |
am c1a564b1: Merge "Add support for secure system overlays. (DO NOT MERGE)" into gingerbread
Merge commit 'c1a564b108c511c0bdd699567c245b031930e718' into gingerbread-plus-aosp
* commit 'c1a564b108c511c0bdd699567c245b031930e718':
Add support for secure system overlays. (DO NOT MERGE)
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/view/WindowManager.java | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/core/java/android/view/WindowManager.java b/core/java/android/view/WindowManager.java index 9c4aefe..091844e 100644 --- a/core/java/android/view/WindowManager.java +++ b/core/java/android/view/WindowManager.java @@ -163,7 +163,8 @@ public interface WindowManager extends ViewManager { @ViewDebug.IntToString(from = TYPE_KEYGUARD_DIALOG, to = "TYPE_KEYGUARD_DIALOG"), @ViewDebug.IntToString(from = TYPE_SYSTEM_ERROR, to = "TYPE_SYSTEM_ERROR"), @ViewDebug.IntToString(from = TYPE_INPUT_METHOD, to = "TYPE_INPUT_METHOD"), - @ViewDebug.IntToString(from = TYPE_INPUT_METHOD_DIALOG, to = "TYPE_INPUT_METHOD_DIALOG") + @ViewDebug.IntToString(from = TYPE_INPUT_METHOD_DIALOG, to = "TYPE_INPUT_METHOD_DIALOG"), + @ViewDebug.IntToString(from = TYPE_SECURE_SYSTEM_OVERLAY, to = "TYPE_SECURE_SYSTEM_OVERLAY") }) public int type; @@ -341,7 +342,19 @@ public interface WindowManager extends ViewManager { * Window type: panel that slides out from the status bar */ public static final int TYPE_STATUS_BAR_PANEL = FIRST_SYSTEM_WINDOW+14; - + + /** + * Window type: secure system overlay windows, which need to be displayed + * on top of everything else. These windows must not take input + * focus, or they will interfere with the keyguard. + * + * This is exactly like {@link #TYPE_SYSTEM_OVERLAY} except that only the + * system itself is allowed to create these overlays. Applications cannot + * obtain permission to create secure system overlays. + * @hide + */ + public static final int TYPE_SECURE_SYSTEM_OVERLAY = FIRST_SYSTEM_WINDOW+15; + /** * End of types of system windows. */ |