summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorWale Ogunwale <ogunwale@google.com>2015-02-03 17:16:15 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-02-03 17:16:16 +0000
commitf5db946ffa1eb2f70fb6b4c24e55dde58480b69e (patch)
tree16276862119cbd9730023d1b1aa26b890f46f6c3 /api
parent95a8a1cf6593e468ec363a4b743e8213676e3eaf (diff)
parent9d3de4cfb42519fefe9d8b03c38ba440bd6bc886 (diff)
downloadframeworks_base-f5db946ffa1eb2f70fb6b4c24e55dde58480b69e.zip
frameworks_base-f5db946ffa1eb2f70fb6b4c24e55dde58480b69e.tar.gz
frameworks_base-f5db946ffa1eb2f70fb6b4c24e55dde58480b69e.tar.bz2
Merge "Support for activity to opt-in/out of resizeable/multi-window support."
Diffstat (limited to 'api')
-rw-r--r--api/current.txt2
-rw-r--r--api/system-current.txt2
2 files changed, 4 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index c8eefea..cd41172 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -1014,6 +1014,7 @@ package android {
field public static final int resizeClip = 16843983; // 0x10104cf
field public static final int resizeMode = 16843619; // 0x1010363
field public static final int resizeable = 16843405; // 0x101028d
+ field public static final int resizeableActivity = 16843995; // 0x10104db
field public static final int resource = 16842789; // 0x1010025
field public static final int restoreAnyVersion = 16843450; // 0x10102ba
field public static final deprecated int restoreNeedsApplication = 16843421; // 0x101029d
@@ -8431,6 +8432,7 @@ package android.content.pm {
field public java.lang.String parentActivityName;
field public java.lang.String permission;
field public int persistableMode;
+ field public boolean resizeable;
field public int screenOrientation;
field public int softInputMode;
field public java.lang.String targetActivity;
diff --git a/api/system-current.txt b/api/system-current.txt
index 320f07b..629cb3f 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -1086,6 +1086,7 @@ package android {
field public static final int resizeClip = 16843983; // 0x10104cf
field public static final int resizeMode = 16843619; // 0x1010363
field public static final int resizeable = 16843405; // 0x101028d
+ field public static final int resizeableActivity = 16843995; // 0x10104db
field public static final int resource = 16842789; // 0x1010025
field public static final int restoreAnyVersion = 16843450; // 0x10102ba
field public static final deprecated int restoreNeedsApplication = 16843421; // 0x101029d
@@ -8639,6 +8640,7 @@ package android.content.pm {
field public java.lang.String parentActivityName;
field public java.lang.String permission;
field public int persistableMode;
+ field public boolean resizeable;
field public int screenOrientation;
field public int softInputMode;
field public java.lang.String targetActivity;