diff options
| author | Wale Ogunwale <ogunwale@google.com> | 2015-04-16 22:35:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-16 22:35:35 +0000 |
| commit | 6041cc1a07511fe8fe913793b9743e32c9b507c6 (patch) | |
| tree | e144b23b5e4d17741ac131f4bf7c8f5cadf445a0 /core/java/android/content | |
| parent | 43fbb42a72e38f6746c5387420fd6f21cd855c93 (diff) | |
| parent | 6dfdfd6741c5a3dd8d8a49ddbd6ee5dfe2fd292d (diff) | |
| download | frameworks_base-6041cc1a07511fe8fe913793b9743e32c9b507c6.zip frameworks_base-6041cc1a07511fe8fe913793b9743e32c9b507c6.tar.gz frameworks_base-6041cc1a07511fe8fe913793b9743e32c9b507c6.tar.bz2 | |
Merge "Added attribute showForAllUsers that deprecates showOnLockScreen"
Diffstat (limited to 'core/java/android/content')
| -rw-r--r-- | core/java/android/content/pm/ActivityInfo.java | 7 | ||||
| -rw-r--r-- | core/java/android/content/pm/PackageParser.java | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/core/java/android/content/pm/ActivityInfo.java b/core/java/android/content/pm/ActivityInfo.java index 8d82aa2..16f6b1e 100644 --- a/core/java/android/content/pm/ActivityInfo.java +++ b/core/java/android/content/pm/ActivityInfo.java @@ -223,11 +223,12 @@ public class ActivityInfo extends ComponentInfo */ public static final int FLAG_HARDWARE_ACCELERATED = 0x0200; /** - * Value for {@link #flags}: true when the application can be displayed over the lockscreen - * and consequently over all users' windows. + * Value for {@link #flags}: true when the application can be displayed for all users + * regardless of if the user of the application is the current user. Set from the + * {@link android.R.attr#showForAllUsers} attribute. * @hide */ - public static final int FLAG_SHOW_ON_LOCK_SCREEN = 0x0400; + public static final int FLAG_SHOW_FOR_ALL_USERS = 0x0400; /** * Bit in {@link #flags} corresponding to an immersive activity * that wishes not to be interrupted by notifications. diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java index 40f4e8f..fed9261 100644 --- a/core/java/android/content/pm/PackageParser.java +++ b/core/java/android/content/pm/PackageParser.java @@ -3099,8 +3099,9 @@ public class PackageParser { a.info.flags |= ActivityInfo.FLAG_FINISH_ON_CLOSE_SYSTEM_DIALOGS; } - if (sa.getBoolean(R.styleable.AndroidManifestActivity_showOnLockScreen, false)) { - a.info.flags |= ActivityInfo.FLAG_SHOW_ON_LOCK_SCREEN; + if (sa.getBoolean(R.styleable.AndroidManifestActivity_showOnLockScreen, false) + || sa.getBoolean(R.styleable.AndroidManifestActivity_showForAllUsers, false)) { + a.info.flags |= ActivityInfo.FLAG_SHOW_FOR_ALL_USERS; } if (sa.getBoolean(R.styleable.AndroidManifestActivity_immersive, false)) { |