From 4ff8891dd21b357948d7e3588f22bee2145784c2 Mon Sep 17 00:00:00 2001 From: Trevor Johns Date: Tue, 19 Apr 2016 01:15:39 -0700 Subject: [PATCH] Revert "Revert "Merge "Resolve merge conflicts of a5f0068 to nyc-dev" into nyc-dev"" This reverts commit bf234fdfba1116cc29e8cc8443d08804843edf94. --- tools/droiddoc/templates-ndk/sdkpage.cs | 33 +- .../templates-sdk-dev/assets/css/default.css | 9277 +++++++++++------ .../assets/css/fullscreen.css | 194 +- .../assets/images/android_logo.png | Bin 0 -> 3095 bytes .../assets/images/android_logo@2x.png | Bin 0 -> 3284 bytes .../assets/images/android_logo_ndk.png | Bin 0 -> 4712 bytes .../assets/images/android_logo_ndk@2x.png | Bin 0 -> 18596 bytes .../images/home/android_m_hero_1200.jpg | Bin 0 -> 112883 bytes .../images/resource-card-default-android.jpg | Bin 15565 -> 12042 bytes .../assets/images/sprite-2x.png | Bin 0 -> 7283 bytes .../assets/images/sprite.png | Bin 0 -> 4928 bytes .../assets/images/sprite@2x.png | Bin 0 -> 11545 bytes .../assets/js/android_3p-bundle.js | 8 +- .../templates-sdk-dev/assets/js/docs.js | 8018 ++++++++------ tools/droiddoc/templates-sdk-dev/body_tag.cs | 15 + tools/droiddoc/templates-sdk-dev/class.cs | 815 +- tools/droiddoc/templates-sdk-dev/classes.cs | 37 +- .../templates-sdk-dev/components/masthead.cs | 624 +- .../templates-sdk-dev/customizations.cs | 790 +- .../droiddoc/templates-sdk-dev/designpage.cs | 14 +- tools/droiddoc/templates-sdk-dev/docpage.cs | 186 +- tools/droiddoc/templates-sdk-dev/footer.cs | 233 +- tools/droiddoc/templates-sdk-dev/head_tag.cs | 190 +- tools/droiddoc/templates-sdk-dev/header.cs | 12 +- .../templates-sdk-dev/jd_lists_unified.cs | 9 + .../templates-sdk-dev/macros_override.cs | 17 +- .../templates-sdk-dev/nosidenavpage.cs | 1 + tools/droiddoc/templates-sdk-dev/package.cs | 48 +- tools/droiddoc/templates-sdk-dev/packages.cs | 34 +- tools/droiddoc/templates-sdk-dev/page_info.cs | 109 + tools/droiddoc/templates-sdk-dev/sample.cs | 30 +- .../droiddoc/templates-sdk-dev/sampleindex.cs | 14 +- tools/droiddoc/templates-sdk-dev/sdkpage.cs | 371 +- tools/droiddoc/templates-sdk-dev/trailer.cs | 18 + .../assets/GPL-LICENSE.txt | 278 + .../templates-sdk-refonly/assets/LICENSE.txt | 20 + .../assets/android-developer-docs.css | 2768 +++++ .../assets/css/default.css | 8877 ++++++++++++++++ .../assets/css/fullscreen.css | 20 + .../assets/design/default.js | 188 + .../assets/images/android-developers-logo.png | Bin 0 -> 3195 bytes .../assets/images/android.png | Bin 0 -> 4934 bytes .../assets/images/android_logo.png | Bin 0 -> 513 bytes .../assets/images/android_logo@2x.png | Bin 0 -> 860 bytes .../assets/images/android_logo_ndk.png | Bin 0 -> 4712 bytes .../assets/images/android_logo_ndk@2x.png | Bin 0 -> 18596 bytes .../assets/images/android_wrench.png | Bin 0 -> 3633 bytes .../assets/images/arrow-left-develop.png | Bin 0 -> 3036 bytes .../assets/images/arrow-left.png | Bin 0 -> 3144 bytes .../assets/images/arrow-right-develop.png | Bin 0 -> 2960 bytes .../assets/images/arrow-right.png | Bin 0 -> 2757 bytes .../assets/images/arrow_bluelink_down.png | Bin 0 -> 180 bytes .../assets/images/arrow_bluelink_up.png | Bin 0 -> 181 bytes .../assets/images/arrow_left_off.jpg | Bin 0 -> 592 bytes .../assets/images/arrow_left_on.jpg | Bin 0 -> 692 bytes .../assets/images/arrow_right_off.jpg | Bin 0 -> 592 bytes .../assets/images/arrow_right_on.jpg | Bin 0 -> 692 bytes .../assets/images/arrows-up-down.png | Bin 0 -> 162 bytes .../assets/images/bg_community_leftDiv.jpg | Bin 0 -> 10692 bytes .../assets/images/bg_fade.jpg | Bin 0 -> 300 bytes .../assets/images/bg_gradient.jpg | Bin 0 -> 1376 bytes .../assets/images/bg_images_sprite.png | Bin 0 -> 2008 bytes .../assets/images/bg_logo.png | Bin 0 -> 1525 bytes .../assets/images/blog-default.png | Bin 0 -> 72570 bytes .../assets/images/body-gradient-tab.png | Bin 0 -> 192 bytes .../assets/images/body-gradient.png | Bin 0 -> 146 bytes .../assets/images/breadcrumb.png | Bin 0 -> 164 bytes .../assets/images/close-grey.png | Bin 0 -> 379 bytes .../assets/images/close-grey_2x.png | Bin 0 -> 830 bytes .../assets/images/close-white.png | Bin 0 -> 292 bytes .../assets/images/close-white_2x.png | Bin 0 -> 586 bytes .../assets/images/close.png | Bin 0 -> 312 bytes .../assets/images/dac_logo.png | Bin 0 -> 2170 bytes .../assets/images/dac_logo@2x.png | Bin 0 -> 2497 bytes .../assets/images/developers-logo.png | Bin 0 -> 10155 bytes .../assets/images/file-generic.png | Bin 0 -> 224 bytes .../assets/images/file-image.png | Bin 0 -> 511 bytes .../assets/images/file-java.png | Bin 0 -> 299 bytes .../assets/images/file-manifest.png | Bin 0 -> 341 bytes .../assets/images/file-xml.png | Bin 0 -> 301 bytes .../assets/images/folder.png | Bin 0 -> 311 bytes .../assets/images/fullscreen.png | Bin 0 -> 1154 bytes .../assets/images/grad-rule-qv.png | Bin 0 -> 249 bytes .../assets/images/home/Android_Dev_Lab_l.png | Bin 0 -> 16512 bytes .../assets/images/home/GDC2011.png | Bin 0 -> 15892 bytes .../assets/images/home/GTV_icon_large.png | Bin 0 -> 7553 bytes .../assets/images/home/GTV_icon_small.png | Bin 0 -> 3576 bytes .../assets/images/home/IO-logo-2011.png | Bin 0 -> 11210 bytes .../assets/images/home/IO-logo.png | Bin 0 -> 3673 bytes .../assets/images/home/adc2_l.png | Bin 0 -> 111790 bytes .../assets/images/home/adc2_s.png | Bin 0 -> 27250 bytes .../assets/images/home/android_adc.png | Bin 0 -> 1849 bytes .../images/home/android_m_hero_1200.jpg | Bin 0 -> 112883 bytes .../images/home/bg_home_announcement.png | Bin 0 -> 2840 bytes .../assets/images/home/bg_home_bottom.jpg | Bin 0 -> 2180 bytes .../assets/images/home/bg_home_carousel.png | Bin 0 -> 3654 bytes .../images/home/bg_home_carousel_board.png | Bin 0 -> 1902 bytes .../images/home/bg_home_carousel_wheel.png | Bin 0 -> 2041 bytes .../images/home/carousel_buttons_sprite.png | Bin 0 -> 3413 bytes .../assets/images/home/devphone-large.png | Bin 0 -> 16630 bytes .../assets/images/home/devphone-small.png | Bin 0 -> 1944 bytes .../assets/images/home/donut-android.png | Bin 0 -> 9386 bytes .../assets/images/home/eclair-android.png | Bin 0 -> 11311 bytes .../assets/images/home/froyo-android.png | Bin 0 -> 17086 bytes .../assets/images/home/gdc-logo.png | Bin 0 -> 2739 bytes .../assets/images/home/gingerdroid.png | Bin 0 -> 11690 bytes .../assets/images/home/google-plus-small.png | Bin 0 -> 5042 bytes .../assets/images/home/google-plus.png | Bin 0 -> 21315 bytes .../assets/images/home/honeycomb-android.png | Bin 0 -> 13716 bytes .../assets/images/home/icon-about.png | Bin 0 -> 5573 bytes .../assets/images/home/icon-design.png | Bin 0 -> 5739 bytes .../assets/images/home/icon-develop.png | Bin 0 -> 5364 bytes .../assets/images/home/icon-distribute.png | Bin 0 -> 4588 bytes .../assets/images/home/ics-android.png | Bin 0 -> 15002 bytes .../assets/images/home/io-large.png | Bin 0 -> 5522 bytes .../assets/images/home/io-small.png | Bin 0 -> 1427 bytes .../assets/images/home/maps-large.png | Bin 0 -> 39756 bytes .../assets/images/home/maps-small.png | Bin 0 -> 3424 bytes .../assets/images/home/market-large.png | Bin 0 -> 5752 bytes .../assets/images/home/market-small.png | Bin 0 -> 3134 bytes .../assets/images/home/sdk-large.png | Bin 0 -> 1616 bytes .../assets/images/home/sdk-small.png | Bin 0 -> 2381 bytes .../assets/images/hr_gray_main.jpg | Bin 0 -> 378 bytes .../assets/images/hr_gray_side.jpg | Bin 0 -> 344 bytes .../assets/images/icon_contribute.jpg | Bin 0 -> 1021 bytes .../assets/images/icon_design.png | Bin 0 -> 697 bytes .../assets/images/icon_download.jpg | Bin 0 -> 1192 bytes .../assets/images/icon_download2.jpg | Bin 0 -> 653 bytes .../assets/images/icon_guidelines_logo.png | Bin 0 -> 44163 bytes .../assets/images/icon_market.jpg | Bin 0 -> 1022 bytes .../assets/images/icon_more.png | Bin 0 -> 1098 bytes .../assets/images/icon_play.png | Bin 0 -> 10201 bytes .../assets/images/icon_robot.jpg | Bin 0 -> 638 bytes .../assets/images/icon_search.png | Bin 0 -> 1406 bytes .../assets/images/icon_world.jpg | Bin 0 -> 511 bytes .../assets/images/left_off.jpg | Bin 0 -> 592 bytes .../assets/images/left_on.jpg | Bin 0 -> 692 bytes .../assets/images/link-out.png | Bin 0 -> 202 bytes .../assets/images/locale.png | Bin 0 -> 393 bytes .../assets/images/logo_breadcrumbz.jpg | Bin 0 -> 3311 bytes .../assets/images/more_bottom.png | Bin 0 -> 1055 bytes .../assets/images/more_check.png | Bin 0 -> 1014 bytes .../assets/images/more_mid.png | Bin 0 -> 958 bytes .../assets/images/more_top.png | Bin 0 -> 1447 bytes .../assets/images/open_source.png | Bin 0 -> 6340 bytes .../assets/images/play-circle-grey.png | Bin .../assets/images/play-circle-grey_2x.png | Bin .../assets/images/play-circle-white.png | Bin .../assets/images/play-circle-white_2x.png | Bin .../assets/images/preliminary.png | Bin 0 -> 2251 bytes .../assets/images/preview.png | Bin 0 -> 1664 bytes .../assets/images/quicknav_arrow.png | Bin 0 -> 2951 bytes .../assets/images/quicknav_btn_bg.png | Bin 0 -> 1024 bytes .../assets/images/resizable-e.gif | Bin 0 -> 2713 bytes .../assets/images/resizable-e2.gif | Bin 0 -> 2680 bytes .../assets/images/resizable-eg.gif | Bin 0 -> 3075 bytes .../assets/images/resizable-s.gif | Bin 0 -> 2617 bytes .../assets/images/resizable-s2.gif | Bin 0 -> 2618 bytes .../assets/images/resizable-s2.png | Bin 0 -> 966 bytes .../assets/images/resizable-sg.gif | Bin 0 -> 3057 bytes .../assets/images/resource-article.png | Bin 0 -> 889 bytes .../assets/images/resource-big-article.png | Bin 0 -> 2095 bytes .../assets/images/resource-big-sample.png | Bin 0 -> 2480 bytes .../assets/images/resource-big-tutorial.png | Bin 0 -> 2544 bytes .../assets/images/resource-big-video.png | Bin 0 -> 2155 bytes .../images/resource-card-default-android.jpg | Bin 0 -> 12042 bytes .../assets/images/resource-sample.png | Bin 0 -> 972 bytes .../assets/images/resource-tutorial.png | Bin 0 -> 1001 bytes .../assets/images/resource-video.png | Bin 0 -> 835 bytes .../assets/images/right_off.jpg | Bin 0 -> 592 bytes .../assets/images/right_on.jpg | Bin 0 -> 692 bytes .../assets/images/sidenav-rule.png | Bin 0 -> 258 bytes .../assets/images/slide_1.jpg | Bin 0 -> 3060 bytes .../assets/images/slide_2.jpg | Bin 0 -> 3736 bytes .../assets/images/slide_3.jpg | Bin 0 -> 3151 bytes .../assets/images/slide_large_1.jpg | Bin 0 -> 19240 bytes .../assets/images/slide_large_2.jpg | Bin 0 -> 20188 bytes .../assets/images/slide_large_3.jpg | Bin 0 -> 20202 bytes .../assets/images/slide_off.jpg | Bin 0 -> 676 bytes .../assets/images/slide_on.jpg | Bin 0 -> 733 bytes .../assets/images/spacer.gif | Bin 0 -> 96 bytes .../assets/images/sprite-2x.png | Bin 0 -> 7283 bytes .../assets/images/sprite.png | Bin 0 -> 3121 bytes .../assets/images/stack-arrow-right.png | Bin 0 -> 198 bytes .../assets/images/styles/callout.png | Bin 0 -> 1383 bytes .../device_galaxynexus_blank_land_span13.png | Bin 0 -> 64431 bytes .../device_galaxynexus_blank_land_span8.png | Bin 0 -> 30679 bytes .../device_galaxynexus_blank_port_span5.png | Bin 0 -> 39994 bytes .../device_galaxynexus_blank_port_span9.png | Bin 0 -> 75920 bytes .../styles/device_nexus4_blank_port_432.png | Bin 0 -> 301931 bytes .../device_nexus5_blank_land_span13.png | Bin 0 -> 57247 bytes .../styles/device_nexus5_blank_port_span5.png | Bin 0 -> 33589 bytes .../images/styles/device_wear_square.png | Bin 0 -> 13039 bytes .../styles/device_wear_square_small.png | Bin 0 -> 21525 bytes .../assets/images/styles/disclosure_down.png | Bin 0 -> 238 bytes .../assets/images/styles/disclosure_left.png | Bin 0 -> 229 bytes .../assets/images/styles/disclosure_right.png | Bin 0 -> 228 bytes .../assets/images/styles/disclosure_up.png | Bin 0 -> 221 bytes .../assets/images/styles/gototop.png | Bin 0 -> 262 bytes .../assets/images/styles/helpouts-logo-35.png | Bin 0 -> 1437 bytes .../images/styles/helpouts-logo-35_2x.png | Bin 0 -> 3315 bytes .../assets/images/styles/ico_action.png | Bin 0 -> 415 bytes .../assets/images/styles/ico_good.png | Bin 0 -> 318 bytes .../assets/images/styles/ico_movie_inline.png | Bin 0 -> 1040 bytes .../assets/images/styles/ico_phone_tablet.png | Bin 0 -> 302 bytes .../assets/images/styles/ico_use.png | Bin 0 -> 437 bytes .../assets/images/styles/ico_web.png | Bin 0 -> 1037 bytes .../assets/images/styles/ico_wrong.png | Bin 0 -> 286 bytes .../images/styles/notice-designers-video.png | Bin 0 -> 3338 bytes .../styles/notice-designers-video@2x.png | Bin 0 -> 6019 bytes .../images/styles/notice-designers.png} | Bin .../images/styles/notice-designers@2x.png} | Bin .../images/styles/notice-developers-video.png | Bin 0 -> 3219 bytes .../styles/notice-developers-video@2x.png | Bin 0 -> 5738 bytes .../images/styles/notice-developers.png | Bin 0 -> 3017 bytes .../images/styles/notice-developers@2x.png | Bin 0 -> 5456 bytes .../assets/images/styles/open_new_page.png | Bin 0 -> 980 bytes .../assets/images/triangle-closed-small.png | Bin 0 -> 166 bytes .../assets/images/triangle-closed.png | Bin 0 -> 3565 bytes .../assets/images/triangle-opened-small.png | Bin 0 -> 170 bytes .../assets/images/triangle-opened.png | Bin 0 -> 3567 bytes .../assets/images/uiguidelines1.png | Bin 0 -> 5258 bytes .../assets/images/video-droid.png | Bin 0 -> 1614 bytes .../assets/js/android_3p-bundle.js | 2766 +++++ .../templates-sdk-refonly/assets/js/docs.js | 5296 ++++++++++ .../assets/js/prettify.js | 28 + tools/droiddoc/templates-sdk-refonly/class.cs | 676 ++ .../droiddoc/templates-sdk-refonly/classes.cs | 54 + .../components/masthead.cs | 174 + .../templates-sdk-refonly/customizations.cs | 620 ++ tools/droiddoc/templates-sdk-refonly/data.hdf | 4 + .../templates-sdk-refonly/designpage.cs | 108 + .../droiddoc/templates-sdk-refonly/docpage.cs | 203 + .../droiddoc/templates-sdk-refonly/footer.cs | 174 + .../templates-sdk-refonly/gcm_navtree_data.cs | 3 + .../templates-sdk-refonly/gms_navtree_data.cs | 3 + .../templates-sdk-refonly/head_tag.cs | 101 + .../droiddoc/templates-sdk-refonly/header.cs | 3 + .../templates-sdk-refonly/header_tabs.cs | 2 + .../templates-sdk-refonly/jd_lists_unified.cs | 1 + .../templates-sdk-refonly/macros_override.cs | 41 + .../templates-sdk-refonly/navtree_data.cs | 3 + .../templates-sdk-refonly/nosidenavpage.cs | 28 + .../droiddoc/templates-sdk-refonly/package.cs | 66 + .../templates-sdk-refonly/packages.cs | 46 + .../droiddoc/templates-sdk-refonly/sample.cs | 151 + .../templates-sdk-refonly/sampleindex.cs | 136 + .../samples_navtree_data.cs | 3 + .../droiddoc/templates-sdk-refonly/sdkpage.cs | 588 ++ .../templates-sdk-refonly/timestamp.cs | 1 + .../droiddoc/templates-sdk-refonly/trailer.cs | 21 + .../templates-sdk/assets/css/default.css | 138 +- .../droiddoc/templates-sdk/assets/js/docs.js | 363 +- .../templates-sdk/components/masthead.cs | 3 +- .../droiddoc/templates-sdk/customizations.cs | 6 +- tools/droiddoc/templates-sdk/designpage.cs | 4 +- tools/droiddoc/templates-sdk/docpage.cs | 10 +- tools/droiddoc/templates-sdk/footer.cs | 2 + tools/droiddoc/templates-sdk/head_tag.cs | 18 +- tools/droiddoc/templates-sdk/sdkpage.cs | 362 +- 260 files changed, 36791 insertions(+), 8663 deletions(-) create mode 100644 tools/droiddoc/templates-sdk-dev/assets/images/android_logo.png create mode 100644 tools/droiddoc/templates-sdk-dev/assets/images/android_logo@2x.png create mode 100644 tools/droiddoc/templates-sdk-dev/assets/images/android_logo_ndk.png create mode 100644 tools/droiddoc/templates-sdk-dev/assets/images/android_logo_ndk@2x.png create mode 100644 tools/droiddoc/templates-sdk-dev/assets/images/home/android_m_hero_1200.jpg create mode 100644 tools/droiddoc/templates-sdk-dev/assets/images/sprite-2x.png create mode 100644 tools/droiddoc/templates-sdk-dev/assets/images/sprite.png create mode 100644 tools/droiddoc/templates-sdk-dev/assets/images/sprite@2x.png create mode 100644 tools/droiddoc/templates-sdk-dev/body_tag.cs create mode 100644 tools/droiddoc/templates-sdk-dev/page_info.cs create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/GPL-LICENSE.txt create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/LICENSE.txt create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/android-developer-docs.css create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/css/default.css create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/css/fullscreen.css create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/design/default.js create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/android-developers-logo.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/android.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/android_logo.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/android_logo@2x.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/android_logo_ndk.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/android_logo_ndk@2x.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/android_wrench.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/arrow-left-develop.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/arrow-left.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/arrow-right-develop.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/arrow-right.png create mode 100755 tools/droiddoc/templates-sdk-refonly/assets/images/arrow_bluelink_down.png create mode 100755 tools/droiddoc/templates-sdk-refonly/assets/images/arrow_bluelink_up.png create mode 100755 tools/droiddoc/templates-sdk-refonly/assets/images/arrow_left_off.jpg create mode 100755 tools/droiddoc/templates-sdk-refonly/assets/images/arrow_left_on.jpg create mode 100755 tools/droiddoc/templates-sdk-refonly/assets/images/arrow_right_off.jpg create mode 100755 tools/droiddoc/templates-sdk-refonly/assets/images/arrow_right_on.jpg create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/arrows-up-down.png create mode 100755 tools/droiddoc/templates-sdk-refonly/assets/images/bg_community_leftDiv.jpg create mode 100755 tools/droiddoc/templates-sdk-refonly/assets/images/bg_fade.jpg create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/bg_gradient.jpg create mode 100755 tools/droiddoc/templates-sdk-refonly/assets/images/bg_images_sprite.png create mode 100755 tools/droiddoc/templates-sdk-refonly/assets/images/bg_logo.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/blog-default.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/body-gradient-tab.png create mode 100755 tools/droiddoc/templates-sdk-refonly/assets/images/body-gradient.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/breadcrumb.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/close-grey.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/close-grey_2x.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/close-white.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/close-white_2x.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/close.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/dac_logo.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/dac_logo@2x.png create mode 100755 tools/droiddoc/templates-sdk-refonly/assets/images/developers-logo.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/file-generic.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/file-image.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/file-java.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/file-manifest.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/file-xml.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/folder.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/fullscreen.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/grad-rule-qv.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/home/Android_Dev_Lab_l.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/home/GDC2011.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/home/GTV_icon_large.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/home/GTV_icon_small.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/home/IO-logo-2011.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/home/IO-logo.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/home/adc2_l.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/home/adc2_s.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/home/android_adc.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/home/android_m_hero_1200.jpg create mode 100755 tools/droiddoc/templates-sdk-refonly/assets/images/home/bg_home_announcement.png create mode 100755 tools/droiddoc/templates-sdk-refonly/assets/images/home/bg_home_bottom.jpg create mode 100755 tools/droiddoc/templates-sdk-refonly/assets/images/home/bg_home_carousel.png create mode 100755 tools/droiddoc/templates-sdk-refonly/assets/images/home/bg_home_carousel_board.png create mode 100755 tools/droiddoc/templates-sdk-refonly/assets/images/home/bg_home_carousel_wheel.png create mode 100755 tools/droiddoc/templates-sdk-refonly/assets/images/home/carousel_buttons_sprite.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/home/devphone-large.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/home/devphone-small.png create mode 100755 tools/droiddoc/templates-sdk-refonly/assets/images/home/donut-android.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/home/eclair-android.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/home/froyo-android.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/home/gdc-logo.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/home/gingerdroid.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/home/google-plus-small.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/home/google-plus.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/home/honeycomb-android.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/home/icon-about.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/home/icon-design.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/home/icon-develop.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/home/icon-distribute.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/home/ics-android.png create mode 100755 tools/droiddoc/templates-sdk-refonly/assets/images/home/io-large.png create mode 100755 tools/droiddoc/templates-sdk-refonly/assets/images/home/io-small.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/home/maps-large.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/home/maps-small.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/home/market-large.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/home/market-small.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/home/sdk-large.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/home/sdk-small.png create mode 100755 tools/droiddoc/templates-sdk-refonly/assets/images/hr_gray_main.jpg create mode 100755 tools/droiddoc/templates-sdk-refonly/assets/images/hr_gray_side.jpg create mode 100755 tools/droiddoc/templates-sdk-refonly/assets/images/icon_contribute.jpg create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/icon_design.png create mode 100755 tools/droiddoc/templates-sdk-refonly/assets/images/icon_download.jpg create mode 100755 tools/droiddoc/templates-sdk-refonly/assets/images/icon_download2.jpg create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/icon_guidelines_logo.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/icon_market.jpg create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/icon_more.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/icon_play.png create mode 100755 tools/droiddoc/templates-sdk-refonly/assets/images/icon_robot.jpg create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/icon_search.png create mode 100755 tools/droiddoc/templates-sdk-refonly/assets/images/icon_world.jpg create mode 100755 tools/droiddoc/templates-sdk-refonly/assets/images/left_off.jpg create mode 100755 tools/droiddoc/templates-sdk-refonly/assets/images/left_on.jpg create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/link-out.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/locale.png create mode 100755 tools/droiddoc/templates-sdk-refonly/assets/images/logo_breadcrumbz.jpg create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/more_bottom.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/more_check.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/more_mid.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/more_top.png create mode 100755 tools/droiddoc/templates-sdk-refonly/assets/images/open_source.png rename tools/droiddoc/{templates-sdk-dev => templates-sdk-refonly}/assets/images/play-circle-grey.png (100%) rename tools/droiddoc/{templates-sdk-dev => templates-sdk-refonly}/assets/images/play-circle-grey_2x.png (100%) rename tools/droiddoc/{templates-sdk-dev => templates-sdk-refonly}/assets/images/play-circle-white.png (100%) rename tools/droiddoc/{templates-sdk-dev => templates-sdk-refonly}/assets/images/play-circle-white_2x.png (100%) create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/preliminary.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/preview.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/quicknav_arrow.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/quicknav_btn_bg.png create mode 100755 tools/droiddoc/templates-sdk-refonly/assets/images/resizable-e.gif create mode 100755 tools/droiddoc/templates-sdk-refonly/assets/images/resizable-e2.gif create mode 100755 tools/droiddoc/templates-sdk-refonly/assets/images/resizable-eg.gif create mode 100755 tools/droiddoc/templates-sdk-refonly/assets/images/resizable-s.gif create mode 100755 tools/droiddoc/templates-sdk-refonly/assets/images/resizable-s2.gif create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/resizable-s2.png create mode 100755 tools/droiddoc/templates-sdk-refonly/assets/images/resizable-sg.gif create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/resource-article.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/resource-big-article.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/resource-big-sample.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/resource-big-tutorial.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/resource-big-video.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/resource-card-default-android.jpg create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/resource-sample.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/resource-tutorial.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/resource-video.png create mode 100755 tools/droiddoc/templates-sdk-refonly/assets/images/right_off.jpg create mode 100755 tools/droiddoc/templates-sdk-refonly/assets/images/right_on.jpg create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/sidenav-rule.png create mode 100755 tools/droiddoc/templates-sdk-refonly/assets/images/slide_1.jpg create mode 100755 tools/droiddoc/templates-sdk-refonly/assets/images/slide_2.jpg create mode 100755 tools/droiddoc/templates-sdk-refonly/assets/images/slide_3.jpg create mode 100755 tools/droiddoc/templates-sdk-refonly/assets/images/slide_large_1.jpg create mode 100755 tools/droiddoc/templates-sdk-refonly/assets/images/slide_large_2.jpg create mode 100755 tools/droiddoc/templates-sdk-refonly/assets/images/slide_large_3.jpg create mode 100755 tools/droiddoc/templates-sdk-refonly/assets/images/slide_off.jpg create mode 100755 tools/droiddoc/templates-sdk-refonly/assets/images/slide_on.jpg create mode 100755 tools/droiddoc/templates-sdk-refonly/assets/images/spacer.gif create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/sprite-2x.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/sprite.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/stack-arrow-right.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/styles/callout.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/styles/device_galaxynexus_blank_land_span13.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/styles/device_galaxynexus_blank_land_span8.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/styles/device_galaxynexus_blank_port_span5.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/styles/device_galaxynexus_blank_port_span9.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/styles/device_nexus4_blank_port_432.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/styles/device_nexus5_blank_land_span13.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/styles/device_nexus5_blank_port_span5.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/styles/device_wear_square.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/styles/device_wear_square_small.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/styles/disclosure_down.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/styles/disclosure_left.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/styles/disclosure_right.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/styles/disclosure_up.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/styles/gototop.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/styles/helpouts-logo-35.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/styles/helpouts-logo-35_2x.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/styles/ico_action.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/styles/ico_good.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/styles/ico_movie_inline.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/styles/ico_phone_tablet.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/styles/ico_use.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/styles/ico_web.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/styles/ico_wrong.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/styles/notice-designers-video.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/styles/notice-designers-video@2x.png rename tools/droiddoc/{templates-sdk-dev/assets/images/styles/notice-designers-material.png => templates-sdk-refonly/assets/images/styles/notice-designers.png} (100%) rename tools/droiddoc/{templates-sdk-dev/assets/images/styles/notice-designers-material@2x.png => templates-sdk-refonly/assets/images/styles/notice-designers@2x.png} (100%) create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/styles/notice-developers-video.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/styles/notice-developers-video@2x.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/styles/notice-developers.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/styles/notice-developers@2x.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/styles/open_new_page.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/triangle-closed-small.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/triangle-closed.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/triangle-opened-small.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/triangle-opened.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/uiguidelines1.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/images/video-droid.png create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/js/android_3p-bundle.js create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/js/docs.js create mode 100644 tools/droiddoc/templates-sdk-refonly/assets/js/prettify.js create mode 100644 tools/droiddoc/templates-sdk-refonly/class.cs create mode 100644 tools/droiddoc/templates-sdk-refonly/classes.cs create mode 100644 tools/droiddoc/templates-sdk-refonly/components/masthead.cs create mode 100644 tools/droiddoc/templates-sdk-refonly/customizations.cs create mode 100644 tools/droiddoc/templates-sdk-refonly/data.hdf create mode 100644 tools/droiddoc/templates-sdk-refonly/designpage.cs create mode 100644 tools/droiddoc/templates-sdk-refonly/docpage.cs create mode 100644 tools/droiddoc/templates-sdk-refonly/footer.cs create mode 100644 tools/droiddoc/templates-sdk-refonly/gcm_navtree_data.cs create mode 100644 tools/droiddoc/templates-sdk-refonly/gms_navtree_data.cs create mode 100644 tools/droiddoc/templates-sdk-refonly/head_tag.cs create mode 100644 tools/droiddoc/templates-sdk-refonly/header.cs create mode 100644 tools/droiddoc/templates-sdk-refonly/header_tabs.cs create mode 100644 tools/droiddoc/templates-sdk-refonly/jd_lists_unified.cs create mode 100644 tools/droiddoc/templates-sdk-refonly/macros_override.cs create mode 100644 tools/droiddoc/templates-sdk-refonly/navtree_data.cs create mode 100644 tools/droiddoc/templates-sdk-refonly/nosidenavpage.cs create mode 100644 tools/droiddoc/templates-sdk-refonly/package.cs create mode 100644 tools/droiddoc/templates-sdk-refonly/packages.cs create mode 100644 tools/droiddoc/templates-sdk-refonly/sample.cs create mode 100644 tools/droiddoc/templates-sdk-refonly/sampleindex.cs create mode 100644 tools/droiddoc/templates-sdk-refonly/samples_navtree_data.cs create mode 100644 tools/droiddoc/templates-sdk-refonly/sdkpage.cs create mode 100644 tools/droiddoc/templates-sdk-refonly/timestamp.cs create mode 100644 tools/droiddoc/templates-sdk-refonly/trailer.cs diff --git a/tools/droiddoc/templates-ndk/sdkpage.cs b/tools/droiddoc/templates-ndk/sdkpage.cs index 817ac47a61..ffad465cdb 100644 --- a/tools/droiddoc/templates-ndk/sdkpage.cs +++ b/tools/droiddoc/templates-ndk/sdkpage.cs @@ -80,13 +80,13 @@ Platform Package Size (Bytes) - MD5 Checksum + SHA1 Checksum Windows 32-bit + href="http://dl.google.com/android/repository/"> @@ -94,7 +94,7 @@ - - Linux 32-bit (x86) - - - - - - -
-
Deprecated since API level - -
- - - - - -
- - - - - -

- - - - - extends
- - - implements - - - - - - - - -
- -
- -
- - - - - - - - - - - -
   ↳
- - - - -
-Known Direct Subclasses - -
- - - -
-Known Indirect Subclasses - -
- - -
- - -

Class Overview

-

- -

- - - - -
- - - - - + - - - - - - - - - - - - () - -
- - -
- - - + + + + + + + + + + + + + + + + () + + +

+

+ + + + - + - - - - - - - - - - - - - - - + + + + + + + + + +

+

+ + + + - + - - - - - - + + + + +

+

- + - - Attribute Name - Related Method - Description - - - - - - - - + + +   @@ -266,30 +95,220 @@ Summary: - + - - + + - - + + - - + -   - + +

  +

+ + + + + + + + +
+

+
+ + +
+
+    
+ + + +

Constant Value: + + + + + () + + +

+ + - + + + + + +
+

+
+
+ +
+
+      ()
+ + +
+ + -
- + + + + +

+ + + +

Related methods:

+
    + +
  • + +
+ + + + + + devsite> + + + + + +
+ + + +

+

+ + + + + + + + +
+ + + + + extends + + + implements + + , + + + + + +

+ + + + + + + + + + +
   ↳ +
+ + +
+ Known Direct Subclasses + +
+ + +
+ Known Indirect Subclasses + +
+ +

+ + +

+ + + + + -

Summary

+

Summary

- +
Nested Classes
+ -

Nested classes

+
XML Attributes
+ @@ -323,15 +344,17 @@ Summary: -

XML attributes

+
- [Expand] -
Inherited XML Attributes
+ -

Inherited XML attributes

-From - + +From + + + +
- - - - - - - - - -
-

- - - - - - - -

-
- - -
-
- - - -
- Constant Value: - - - - - - () - - -
- -
-
- - - - - - - - -
-

- - - - - - - - - - () -

-
-
- -
-
- - -
-
- - - - - - - -
-

-

-
- - - -
-
Related Methods
-
    - -
  • - -
-
-
-
- - - - + -

XML Attributes

+

XML attributes

@@ -615,7 +557,7 @@ From -

Enum Values

+

Enum values

@@ -623,7 +565,7 @@ From -

Constants

+

Constants

@@ -631,7 +573,7 @@ From -

Fields

+

Fields

@@ -639,7 +581,7 @@ From -

Public Constructors

+

Public constructors

@@ -647,7 +589,7 @@ From -

Protected Constructors

+

Protected constructors

@@ -655,27 +597,24 @@ From -

Public Methods

+

Public methods

-

Protected Methods

+

Protected methods

- +
+ - - - - - + diff --git a/tools/droiddoc/templates-sdk-dev/classes.cs b/tools/droiddoc/templates-sdk-dev/classes.cs index 405892d673..2793db3f0a 100644 --- a/tools/droiddoc/templates-sdk-dev/classes.cs +++ b/tools/droiddoc/templates-sdk-dev/classes.cs @@ -1,34 +1,27 @@ - + + devsite> - - + -
- -

-
+

These are the API classes. See all +API packages.

-
-

These are the Android API classes. See all API packages.

-
-    +
+   

- +
@@ -43,11 +36,9 @@
+ -
-
- - + - \ No newline at end of file + diff --git a/tools/droiddoc/templates-sdk-dev/components/masthead.cs b/tools/droiddoc/templates-sdk-dev/components/masthead.cs index d48ea29747..b105b52912 100644 --- a/tools/droiddoc/templates-sdk-dev/components/masthead.cs +++ b/tools/droiddoc/templates-sdk-dev/components/masthead.cs @@ -1,374 +1,294 @@ - - - - - - - - +
-
- \ No newline at end of file + + + , + \ No newline at end of file diff --git a/tools/droiddoc/templates-sdk-dev/nosidenavpage.cs b/tools/droiddoc/templates-sdk-dev/nosidenavpage.cs index 8e5969361e..61754f05b5 100644 --- a/tools/droiddoc/templates-sdk-dev/nosidenavpage.cs +++ b/tools/droiddoc/templates-sdk-dev/nosidenavpage.cs @@ -11,6 +11,7 @@
+
diff --git a/tools/droiddoc/templates-sdk-dev/package.cs b/tools/droiddoc/templates-sdk-dev/package.cs index 22255650bd..460a67b26b 100644 --- a/tools/droiddoc/templates-sdk-dev/package.cs +++ b/tools/droiddoc/templates-sdk-dev/package.cs @@ -1,50 +1,25 @@ - + + devsite> - - - - + + +
-
- -
-
- - -
-
- -
- package -

-
- -
- -
+

-
- -
+

-
-
@@ -55,11 +30,10 @@ +
+ -
-
- - + diff --git a/tools/droiddoc/templates-sdk-dev/packages.cs b/tools/droiddoc/templates-sdk-dev/packages.cs index 5056d3a5d7..4db2ea9e12 100644 --- a/tools/droiddoc/templates-sdk-dev/packages.cs +++ b/tools/droiddoc/templates-sdk-dev/packages.cs @@ -1,33 +1,19 @@ - + + devsite> - - + -
- -

-
- -
- -
-

-
+

These are the API packages. +See all API classes.

- +
- + @@ -35,11 +21,9 @@
+ -
-
- - + diff --git a/tools/droiddoc/templates-sdk-dev/page_info.cs b/tools/droiddoc/templates-sdk-dev/page_info.cs new file mode 100644 index 0000000000..fad1274194 --- /dev/null +++ b/tools/droiddoc/templates-sdk-dev/page_info.cs @@ -0,0 +1,109 @@ + +
+ +
+
+ + +
+
+
+
+
Deprecated since API level + +
+ + + + + + + + + + + + + + + + + + +
\ No newline at end of file diff --git a/tools/droiddoc/templates-sdk-dev/sample.cs b/tools/droiddoc/templates-sdk-dev/sample.cs index 32a0788efc..2c5b9d2def 100644 --- a/tools/droiddoc/templates-sdk-dev/sample.cs +++ b/tools/droiddoc/templates-sdk-dev/sample.cs @@ -5,11 +5,6 @@ -
class="fullpage"class="col-13" id="doc-col"class="col-12" id="doc-col" > -