diff options
| author | Wale Ogunwale <ogunwale@google.com> | 2015-04-28 23:38:55 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-28 23:38:56 +0000 |
| commit | b1c9539d3fa11cf7573ed9faaade4872e1a952f0 (patch) | |
| tree | ec1beae0188378a31c41a6bb37e06db6ffb53058 /core/res | |
| parent | b3a020a6de45bbcb1329d8f820e569cfd0de9325 (diff) | |
| parent | a20943188cd4d8b5ffa101bfb3ce6fc100c935b7 (diff) | |
| download | frameworks_base-b1c9539d3fa11cf7573ed9faaade4872e1a952f0.zip frameworks_base-b1c9539d3fa11cf7573ed9faaade4872e1a952f0.tar.gz frameworks_base-b1c9539d3fa11cf7573ed9faaade4872e1a952f0.tar.bz2 | |
Merge "@hide resizeableActivity attribute and remove from public api" into mnc-dev
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" /> |