summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorCraig Mautner <cmautner@google.com>2014-04-23 21:38:50 -0700
committerCraig Mautner <cmautner@google.com>2014-04-24 08:41:29 -0700
commitffd14a13ce7425562777152256ea7760d95f254d (patch)
tree231e560ce7c51ef3aa300f73b931f23ebb239432 /api
parent7f7bdb2712d4988efa5e914c0b54271752b49407 (diff)
downloadframeworks_base-ffd14a13ce7425562777152256ea7760d95f254d.zip
frameworks_base-ffd14a13ce7425562777152256ea7760d95f254d.tar.gz
frameworks_base-ffd14a13ce7425562777152256ea7760d95f254d.tar.bz2
Add activity attribute allowEmbedded
Activitys without allowEmbedded=true may not be launched in an ActivityView. Fixes bug 13693121. Change-Id: I431d554300fc3504ab1bc7d73a58d5dad24f8639
Diffstat (limited to 'api')
-rw-r--r--api/current.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index a3824d7..2464e38 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -277,6 +277,7 @@ package android {
field public static final int allContactsName = 16843468; // 0x10102cc
field public static final int allowBackup = 16843392; // 0x1010280
field public static final int allowClearUserData = 16842757; // 0x1010005
+ field public static final int allowEmbedded = 16843765; // 0x10103f5
field public static final int allowParallelSyncs = 16843570; // 0x1010332
field public static final int allowSingleTap = 16843353; // 0x1010259
field public static final int allowTaskReparenting = 16843268; // 0x1010204