summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorCraig Mautner <cmautner@google.com>2012-10-05 14:45:52 -0700
committerCraig Mautner <cmautner@google.com>2012-10-06 13:09:58 -0700
commit5962b12bedc4a1d0354816c1cd6b06ba04f6d807 (patch)
treeb9918fad07cf0e0ff84d510b6e17b31cf48394f9 /api
parent88400d3a31139c40c4014faf86c243647087ef6c (diff)
downloadframeworks_base-5962b12bedc4a1d0354816c1cd6b06ba04f6d807.zip
frameworks_base-5962b12bedc4a1d0354816c1cd6b06ba04f6d807.tar.gz
frameworks_base-5962b12bedc4a1d0354816c1cd6b06ba04f6d807.tar.bz2
Adds showWhenLocked attribute to Activities.
The new attribute allows an Activity such as the alarm to appear on all users screens. Bug: 7213805 fixed. Change-Id: If7866b13d88c04af07debc69e0e875d0adc6050a
Diffstat (limited to 'api')
-rw-r--r--api/17.txt1
-rw-r--r--api/current.txt1
2 files changed, 2 insertions, 0 deletions
diff --git a/api/17.txt b/api/17.txt
index e86de90..d7f7c3c 100644
--- a/api/17.txt
+++ b/api/17.txt
@@ -912,6 +912,7 @@ package android {
field public static final int showAsAction = 16843481; // 0x10102d9
field public static final int showDefault = 16843258; // 0x10101fa
field public static final int showDividers = 16843561; // 0x1010329
+ field public static final int showOnLockScreen = 16843721; // 0x10103c9
field public static final int showSilent = 16843259; // 0x10101fb
field public static final int showWeekNumber = 16843582; // 0x101033e
field public static final int shownWeekCount = 16843585; // 0x1010341
diff --git a/api/current.txt b/api/current.txt
index e86de90..d7f7c3c 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -912,6 +912,7 @@ package android {
field public static final int showAsAction = 16843481; // 0x10102d9
field public static final int showDefault = 16843258; // 0x10101fa
field public static final int showDividers = 16843561; // 0x1010329
+ field public static final int showOnLockScreen = 16843721; // 0x10103c9
field public static final int showSilent = 16843259; // 0x10101fb
field public static final int showWeekNumber = 16843582; // 0x101033e
field public static final int shownWeekCount = 16843585; // 0x1010341