diff options
| -rw-r--r-- | Android.mk | 4 | ||||
| -rw-r--r-- | api/current.xml | 46 |
2 files changed, 1 insertions, 49 deletions
@@ -355,7 +355,7 @@ framework_docs_LOCAL_JAVA_LIBRARIES := \ framework \ framework_docs_LOCAL_MODULE_CLASS := JAVA_LIBRARIES -framework_docs_LOCAL_DROIDDOC_HTML_DIR := $(LOCAL_PATH)/docs/html $(OUT_DOCS)/gen +framework_docs_LOCAL_DROIDDOC_HTML_DIR := docs/html # The since flag (-since N.xml API_LEVEL) is used to add API Level information # to the reference documentation. Must be in order of oldest to newest. framework_docs_LOCAL_DROIDDOC_OPTIONS := \ @@ -522,7 +522,6 @@ $(static_doc_index_redirect): \ $(full_target): $(static_doc_index_redirect) $(full_target): $(framework_built) -$(full_target): monkeyruner-docs-target # ==== docs for the web (on the google app engine server) ======================= include $(CLEAR_VARS) @@ -552,7 +551,6 @@ include $(BUILD_DROIDDOC) # explicitly specify that online-sdk depends on framework-res and any generated docs $(full_target): framework-res-package-target -$(full_target): monkeyruner-docs-target # ==== docs that have all of the stuff that's @hidden ======================= include $(CLEAR_VARS) diff --git a/api/current.xml b/api/current.xml index 158e251..3120561 100644 --- a/api/current.xml +++ b/api/current.xml @@ -4761,17 +4761,6 @@ visibility="public" > </field> -<field name="heavyWeight" - type="int" - transient="false" - volatile="false" - value="16843456" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> <field name="height" type="int" transient="false" @@ -22347,17 +22336,6 @@ visibility="public" > </method> -<method name="isImmersive" - return="boolean" - abstract="false" - native="false" - synchronized="false" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -</method> <method name="isTaskRoot" return="boolean" abstract="false" @@ -23389,19 +23367,6 @@ <parameter name="uri" type="android.net.Uri"> </parameter> </method> -<method name="setImmersive" - return="void" - abstract="false" - native="false" - synchronized="false" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="i" type="boolean"> -</parameter> -</method> <method name="setIntent" return="void" abstract="false" @@ -52977,17 +52942,6 @@ visibility="public" > </field> -<field name="FLAG_HEAVY_WEIGHT" - type="int" - transient="false" - volatile="false" - value="1048576" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> <field name="FLAG_KILL_AFTER_RESTORE" type="int" transient="false" |