summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorCraig Mautner <cmautner@google.com>2015-04-01 12:17:18 -0700
committerCraig Mautner <cmautner@google.com>2015-04-15 14:27:56 -0700
commit15df08abd8190353e1430f88c2ed6462d72a5b25 (patch)
treeab7294d951d4bf403a2af98d82f7e4ed7070e539 /api
parent8315167693d033a8857e4d10c2f1df52b15a8b78 (diff)
downloadframeworks_base-15df08abd8190353e1430f88c2ed6462d72a5b25.zip
frameworks_base-15df08abd8190353e1430f88c2ed6462d72a5b25.tar.gz
frameworks_base-15df08abd8190353e1430f88c2ed6462d72a5b25.tar.bz2
Introduce android:lockTaskMode
The ability for tasks to be started in locktask mode or pinned is dependent on the value of android:lockTaskMode for the root activity of the task. For bug 19995702 Change-Id: I514a144a3a0ff7dbdd4987da5361b94bdfe9a437
Diffstat (limited to 'api')
-rw-r--r--api/current.txt1
-rw-r--r--api/system-current.txt1
2 files changed, 2 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 7575a07..cf3f489 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -815,6 +815,7 @@ package android {
field public static final int listSeparatorTextViewStyle = 16843272; // 0x1010208
field public static final int listViewStyle = 16842868; // 0x1010074
field public static final int listViewWhiteStyle = 16842869; // 0x1010075
+ field public static final int lockTaskMode = 16844013; // 0x10104ed
field public static final int logo = 16843454; // 0x10102be
field public static final int longClickable = 16842982; // 0x10100e6
field public static final int loopViews = 16843527; // 0x1010307
diff --git a/api/system-current.txt b/api/system-current.txt
index fb44b61..15c00f4 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -888,6 +888,7 @@ package android {
field public static final int listSeparatorTextViewStyle = 16843272; // 0x1010208
field public static final int listViewStyle = 16842868; // 0x1010074
field public static final int listViewWhiteStyle = 16842869; // 0x1010075
+ field public static final int lockTaskMode = 16844013; // 0x10104ed
field public static final int logo = 16843454; // 0x10102be
field public static final int longClickable = 16842982; // 0x10100e6
field public static final int loopViews = 16843527; // 0x1010307