Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added attribute showForAllUsers that deprecates showOnLockScreen

Browse Source 
The new name is more meaningful to what the attribute actually does.

Also, force the FLAG_SHOWN_WHEN_LOCKED flag for windows that belong
to acitivties with the showForAllUsers attribute set.

Bug: 20227306
Change-Id: Ifd49166c3ec0e67ae43addc0fb30038523332ea5
This commit is contained in:
Wale Ogunwale
2015-04-15 12:01:38 -07:00
parent 3f2631f526
commit 6dfdfd6741
13 changed files with 51 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/content/pm/ActivityInfo.java
View File

@@ -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.

5
core/java/android/content/pm/PackageParser.java
View File

@@ -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)) {