diff options
| author | Wale Ogunwale <ogunwale@google.com> | 2015-04-29 02:25:05 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-29 02:25:05 +0000 |
| commit | d1a10723a33461a61039f463fdea1a1aa11202be (patch) | |
| tree | 7e8ff79dbb2ee9b548f1cd75d497d47b600a1449 /core/res | |
| parent | b86d6203521f043b5041e9539328570de73856c1 (diff) | |
| parent | a2166c0a6a0189d147fc1c529eea585845457f3a (diff) | |
| download | frameworks_base-d1a10723a33461a61039f463fdea1a1aa11202be.zip frameworks_base-d1a10723a33461a61039f463fdea1a1aa11202be.tar.gz frameworks_base-d1a10723a33461a61039f463fdea1a1aa11202be.tar.bz2 | |
am a2166c0a: am 49937b5c: am b1c9539d: Merge "@hide resizeableActivity attribute and remove from public api" into mnc-dev
* commit 'a2166c0a6a0189d147fc1c529eea585845457f3a':
@hide resizeableActivity attribute and remove from public api
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/res/values/attrs_manifest.xml | 4 | ||||
| -rw-r--r-- | core/res/res/values/public.xml | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/core/res/res/values/attrs_manifest.xml b/core/res/res/values/attrs_manifest.xml index 0c685e0..4631427 100644 --- a/core/res/res/values/attrs_manifest.xml +++ b/core/res/res/values/attrs_manifest.xml @@ -1044,7 +1044,8 @@ <p>NOTE: The value of {@link android.R.attr#screenOrientation} will be ignored for resizeable activities as the system doesn't support fixed orientation on a resizeable - activity. --> + activity. + @hide --> <attr name="resizeableActivity" format="boolean" /> <!-- This value indicates how tasks rooted at this activity will behave in lockTask mode. @@ -1796,6 +1797,7 @@ <attr name="autoRemoveFromRecents" /> <attr name="relinquishTaskIdentity" /> <attr name="resumeWhilePausing" /> + <!-- @hide --> <attr name="resizeableActivity" /> <attr name="lockTaskMode" /> <attr name="showForAllUsers" /> diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 4609c79..dd4c134 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -2610,7 +2610,6 @@ <public type="attr" name="trackTint" /> <public type="attr" name="trackTintMode" /> - <public type="attr" name="resizeableActivity" /> <public type="attr" name="start" /> <public type="attr" name="end" /> <public type="attr" name="windowLightStatusBar" /> |