diff options
| author | Wale Ogunwale <ogunwale@google.com> | 2015-02-03 20:30:24 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-02-03 20:30:25 +0000 |
| commit | ad575295918dba197dcf61bfb81d56348ed1f073 (patch) | |
| tree | 6f4b176d2fa9c1aafd867430d502cd29f6332988 | |
| parent | 35fa2bc2e4debee1434bd784209895472ecd174f (diff) | |
| parent | 4aab1bba6975b0447ad7435120edb5a90c8506f8 (diff) | |
| download | frameworks_base-ad575295918dba197dcf61bfb81d56348ed1f073.zip frameworks_base-ad575295918dba197dcf61bfb81d56348ed1f073.tar.gz frameworks_base-ad575295918dba197dcf61bfb81d56348ed1f073.tar.bz2 | |
Merge "@hide ActivityInfo.resizeable."
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/content/pm/ActivityInfo.java | 1 | ||||
| -rw-r--r-- | core/res/res/values/attrs_manifest.xml | 2 |
4 files changed, 2 insertions, 3 deletions
diff --git a/api/current.txt b/api/current.txt index 2a6d33e..c7dbd49 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 5388ff3..e1a236f 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 452603a..4723c0d 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 b9ed78a..84609ca 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 |