summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--api/current.txt1
-rw-r--r--api/system-current.txt1
-rw-r--r--core/java/android/content/pm/ActivityInfo.java1
-rw-r--r--core/res/res/values/attrs_manifest.xml2
4 files changed, 2 insertions, 3 deletions
diff --git a/api/current.txt b/api/current.txt
index 2a6d33eca630..c7dbd495c75b 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -8432,7 +8432,6 @@ 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 5388ff31ac9d..e1a236fe7fbd 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -8640,7 +8640,6 @@ 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/core/java/android/content/pm/ActivityInfo.java b/core/java/android/content/pm/ActivityInfo.java
index 452603a7dca4..4723c0db621c 100644
--- a/core/java/android/content/pm/ActivityInfo.java
+++ b/core/java/android/content/pm/ActivityInfo.java
@@ -644,6 +644,7 @@ public class ActivityInfo extends ComponentInfo
/**
* Value indicating if the activity is resizeable to any dimension.
* See {@link android.R.attr#resizeableActivity}.
+ * @hide
*/
public boolean resizeable;
diff --git a/core/res/res/values/attrs_manifest.xml b/core/res/res/values/attrs_manifest.xml
index b9ed78ac4d04..84609cadaf14 100644
--- a/core/res/res/values/attrs_manifest.xml
+++ b/core/res/res/values/attrs_manifest.xml
@@ -1017,7 +1017,7 @@
at the same time.
<p>The default value is <code>false</code> for applications with
- <code>targetSdkVersion</code> lesser than {@link android.os.Build.VERSION_CODE#MNC} and
+ <code>targetSdkVersion</code> lesser than {@link android.os.Build.VERSION_CODES#MNC} and
<code>true</code> otherwise.
<p>NOTE: A task's root activity value is applied to all additional activities launched in