summaryrefslogtreecommitdiffstats
path: root/docs/html
diff options
context:
space:
mode:
Diffstat (limited to 'docs/html')
-rw-r--r--[-rwxr-xr-x]docs/html/google/play/billing/billing_admin.jd0
-rw-r--r--[-rwxr-xr-x]docs/html/google/play/billing/billing_best_practices.jd0
-rw-r--r--[-rwxr-xr-x]docs/html/google/play/billing/billing_integrate.jd0
-rw-r--r--[-rwxr-xr-x]docs/html/google/play/billing/billing_overview.jd0
-rw-r--r--[-rwxr-xr-x]docs/html/google/play/billing/billing_reference.jd0
-rw-r--r--[-rwxr-xr-x]docs/html/google/play/billing/billing_testing.jd0
-rw-r--r--[-rwxr-xr-x]docs/html/google/play/billing/index.jd0
-rw-r--r--[-rwxr-xr-x]docs/html/google/play/billing/v2/billing_integrate.jd0
-rw-r--r--[-rwxr-xr-x]docs/html/google/play/billing/v2/billing_subscriptions.jd0
-rw-r--r--[-rwxr-xr-x]docs/html/guide/appendix/faq/troubleshooting.jd0
-rw-r--r--[-rwxr-xr-x]docs/html/guide/topics/manifest/uses-configuration-element.jd0
-rw-r--r--[-rwxr-xr-x]docs/html/guide/topics/resources/localization.jd0
-rw-r--r--[-rwxr-xr-x]docs/html/guide/topics/resources/resources-i18n.jd0
-rw-r--r--docs/html/guide/topics/ui/declaring-layout.jd2
-rw-r--r--[-rwxr-xr-x]docs/html/guide/topics/ui/images/hello-gallery.pngbin5593 -> 5593 bytes
-rw-r--r--[-rwxr-xr-x]docs/html/guide/topics/ui/images/hello-gridview.pngbin21768 -> 21768 bytes
-rw-r--r--[-rwxr-xr-x]docs/html/guide/topics/ui/images/hello-linearlayout.pngbin4207 -> 4207 bytes
-rw-r--r--[-rwxr-xr-x]docs/html/guide/topics/ui/images/hello-relativelayout.pngbin2399 -> 2399 bytes
-rw-r--r--[-rwxr-xr-x]docs/html/guide/topics/ui/images/hello-tablelayout.pngbin3446 -> 3446 bytes
-rw-r--r--[-rwxr-xr-x]docs/html/images/billing_check_supported.pngbin21536 -> 21536 bytes
-rw-r--r--[-rwxr-xr-x]docs/html/images/billing_checkout_flow.pngbin108980 -> 108980 bytes
-rw-r--r--[-rwxr-xr-x]docs/html/images/billing_list_form.pngbin96595 -> 96595 bytes
-rw-r--r--[-rwxr-xr-x]docs/html/images/billing_list_form_2.pngbin140745 -> 140745 bytes
-rw-r--r--[-rwxr-xr-x]docs/html/images/billing_product_list.pngbin67155 -> 67155 bytes
-rw-r--r--[-rwxr-xr-x]docs/html/images/billing_product_list_entry.pngbin77842 -> 77842 bytes
-rw-r--r--[-rwxr-xr-x]docs/html/images/billing_refund.pngbin30801 -> 30801 bytes
-rw-r--r--[-rwxr-xr-x]docs/html/images/billing_request_purchase.pngbin38108 -> 38108 bytes
-rw-r--r--[-rwxr-xr-x]docs/html/images/billing_restore_transactions.pngbin25999 -> 25999 bytes
-rw-r--r--[-rwxr-xr-x]docs/html/images/billing_test_flow.pngbin105261 -> 105261 bytes
-rw-r--r--[-rwxr-xr-x]docs/html/images/custom_message.pngbin17871 -> 17871 bytes
-rw-r--r--[-rwxr-xr-x]docs/html/images/custom_toast.pngbin19966 -> 19966 bytes
-rw-r--r--[-rwxr-xr-x]docs/html/images/developing/developing_overview.pngbin122635 -> 122635 bytes
-rw-r--r--[-rwxr-xr-x]docs/html/images/drm_arch.pngbin24108 -> 24108 bytes
-rw-r--r--[-rwxr-xr-x]docs/html/images/jet/jc_audition_wnd.pngbin38252 -> 38252 bytes
-rw-r--r--[-rwxr-xr-x]docs/html/images/jet/jc_event_wnd.pngbin54424 -> 54424 bytes
-rw-r--r--[-rwxr-xr-x]docs/html/images/jet/jc_main_wnd.pngbin62984 -> 62984 bytes
-rw-r--r--[-rwxr-xr-x]docs/html/images/jet/jc_moveseg_wnd.pngbin16350 -> 16350 bytes
-rw-r--r--[-rwxr-xr-x]docs/html/images/jet/jc_open_dlg.pngbin17097 -> 17097 bytes
-rw-r--r--[-rwxr-xr-x]docs/html/images/jet/jc_rep_wnd.pngbin21566 -> 21566 bytes
-rw-r--r--[-rwxr-xr-x]docs/html/images/jet/jc_repseg_wnd.pngbin21236 -> 21236 bytes
-rw-r--r--[-rwxr-xr-x]docs/html/images/jet/jc_seg_wnd.pngbin49892 -> 49892 bytes
-rw-r--r--[-rwxr-xr-x]docs/html/images/notifications_window.pngbin10511 -> 10511 bytes
-rw-r--r--[-rwxr-xr-x]docs/html/images/options_menu.pngbin40602 -> 40602 bytes
-rw-r--r--[-rwxr-xr-x]docs/html/images/publishing/publishing_android_market.pngbin35991 -> 35991 bytes
-rw-r--r--[-rwxr-xr-x]docs/html/images/publishing/publishing_overview.pngbin26898 -> 26898 bytes
-rw-r--r--[-rwxr-xr-x]docs/html/images/publishing/publishing_overview_prep.pngbin37122 -> 37122 bytes
-rw-r--r--[-rwxr-xr-x]docs/html/images/publishing/publishing_preparing.pngbin66767 -> 66767 bytes
-rw-r--r--[-rwxr-xr-x]docs/html/images/publishing/publishing_via_email.pngbin47608 -> 47608 bytes
-rw-r--r--[-rwxr-xr-x]docs/html/images/radio_buttons.pngbin75740 -> 75740 bytes
-rw-r--r--[-rwxr-xr-x]docs/html/images/resources/arrow.pngbin486 -> 486 bytes
-rw-r--r--[-rwxr-xr-x]docs/html/images/resources/right-arrow.pngbin420 -> 420 bytes
-rw-r--r--[-rwxr-xr-x]docs/html/images/status_bar.pngbin3719 -> 3719 bytes
-rw-r--r--[-rwxr-xr-x]docs/html/images/testing/android_test_framework.pngbin47368 -> 47368 bytes
-rw-r--r--[-rwxr-xr-x]docs/html/images/training/ads-close-to-button.pngbin37139 -> 37139 bytes
-rw-r--r--[-rwxr-xr-x]docs/html/images/training/ads-cover-content.pngbin42593 -> 42593 bytes
-rw-r--r--[-rwxr-xr-x]docs/html/images/training/ads-eclipse-build-path.pngbin58664 -> 58664 bytes
-rw-r--r--[-rwxr-xr-x]docs/html/images/training/ads-top-banner.pngbin35606 -> 35606 bytes
-rw-r--r--[-rwxr-xr-x]docs/html/images/training/button.pngbin720 -> 720 bytes
-rw-r--r--[-rwxr-xr-x]docs/html/images/training/button_with_marks.pngbin3396 -> 3396 bytes
-rw-r--r--[-rwxr-xr-x]docs/html/images/training/buttons_stretched.pngbin1617 -> 1617 bytes
-rw-r--r--[-rwxr-xr-x]docs/html/images/training/cool-places.pngbin31640 -> 31640 bytes
-rw-r--r--[-rwxr-xr-x]docs/html/images/training/device-mgmt-activate-device-admin.pngbin42791 -> 42791 bytes
-rw-r--r--[-rwxr-xr-x]docs/html/images/training/panoramio-grid.pngbin147552 -> 147552 bytes
-rw-r--r--[-rwxr-xr-x]docs/html/images/ui/clipboard/copy_paste_framework.pngbin37996 -> 37996 bytes
-rw-r--r--[-rwxr-xr-x]docs/html/images/ui/notifications/custom_message.pngbin17871 -> 17871 bytes
-rw-r--r--[-rwxr-xr-x]docs/html/images/ui/notifications/notifications_window.pngbin10392 -> 10392 bytes
-rw-r--r--[-rwxr-xr-x]docs/html/images/ui/notifications/status_bar.pngbin7161 -> 7161 bytes
-rw-r--r--[-rwxr-xr-x]docs/html/resources/images/KeyChainDemo2.pngbin40334 -> 40334 bytes
-rw-r--r--[-rwxr-xr-x]docs/html/resources/images/KeyChainDemo3.pngbin62468 -> 62468 bytes
-rw-r--r--[-rwxr-xr-x]docs/html/resources/images/KeyChainDemo4.pngbin61334 -> 61334 bytes
-rw-r--r--[-rwxr-xr-x]docs/html/resources/images/SipDemo.pngbin72267 -> 72267 bytes
-rw-r--r--[-rwxr-xr-x]docs/html/resources/images/vpn-confirmation.pngbin60214 -> 60214 bytes
-rw-r--r--docs/html/tools/debugging/debugging-tracing.jd124
-rw-r--r--[-rwxr-xr-x]docs/html/tools/publishing/publishing_overview.jd0
-rw-r--r--[-rwxr-xr-x]docs/html/tools/testing/testing_android.jd0
-rw-r--r--[-rwxr-xr-x]docs/html/training/animation/anim_card_flip.mp4bin87087 -> 87087 bytes
-rw-r--r--[-rwxr-xr-x]docs/html/training/animation/anim_card_flip.ogvbin135105 -> 135105 bytes
-rw-r--r--[-rwxr-xr-x]docs/html/training/animation/anim_card_flip.webmbin95870 -> 95870 bytes
-rw-r--r--[-rwxr-xr-x]docs/html/training/animation/anim_screenslide.mp4bin205799 -> 205799 bytes
-rw-r--r--[-rwxr-xr-x]docs/html/training/animation/anim_screenslide.ogvbin727629 -> 727629 bytes
-rw-r--r--[-rwxr-xr-x]docs/html/training/animation/anim_screenslide.webmbin131539 -> 131539 bytes
81 files changed, 3 insertions, 123 deletions
diff --git a/docs/html/google/play/billing/billing_admin.jd b/docs/html/google/play/billing/billing_admin.jd
index f1e4ec4..f1e4ec4 100755..100644
--- a/docs/html/google/play/billing/billing_admin.jd
+++ b/docs/html/google/play/billing/billing_admin.jd
diff --git a/docs/html/google/play/billing/billing_best_practices.jd b/docs/html/google/play/billing/billing_best_practices.jd
index 015e7c3..015e7c3 100755..100644
--- a/docs/html/google/play/billing/billing_best_practices.jd
+++ b/docs/html/google/play/billing/billing_best_practices.jd
diff --git a/docs/html/google/play/billing/billing_integrate.jd b/docs/html/google/play/billing/billing_integrate.jd
index 57227a8..57227a8 100755..100644
--- a/docs/html/google/play/billing/billing_integrate.jd
+++ b/docs/html/google/play/billing/billing_integrate.jd
diff --git a/docs/html/google/play/billing/billing_overview.jd b/docs/html/google/play/billing/billing_overview.jd
index 581c648..581c648 100755..100644
--- a/docs/html/google/play/billing/billing_overview.jd
+++ b/docs/html/google/play/billing/billing_overview.jd
diff --git a/docs/html/google/play/billing/billing_reference.jd b/docs/html/google/play/billing/billing_reference.jd
index e168d70..e168d70 100755..100644
--- a/docs/html/google/play/billing/billing_reference.jd
+++ b/docs/html/google/play/billing/billing_reference.jd
diff --git a/docs/html/google/play/billing/billing_testing.jd b/docs/html/google/play/billing/billing_testing.jd
index 42b6d65..42b6d65 100755..100644
--- a/docs/html/google/play/billing/billing_testing.jd
+++ b/docs/html/google/play/billing/billing_testing.jd
diff --git a/docs/html/google/play/billing/index.jd b/docs/html/google/play/billing/index.jd
index 1969154..1969154 100755..100644
--- a/docs/html/google/play/billing/index.jd
+++ b/docs/html/google/play/billing/index.jd
diff --git a/docs/html/google/play/billing/v2/billing_integrate.jd b/docs/html/google/play/billing/v2/billing_integrate.jd
index ca41e0b..ca41e0b 100755..100644
--- a/docs/html/google/play/billing/v2/billing_integrate.jd
+++ b/docs/html/google/play/billing/v2/billing_integrate.jd
diff --git a/docs/html/google/play/billing/v2/billing_subscriptions.jd b/docs/html/google/play/billing/v2/billing_subscriptions.jd
index db18a53..db18a53 100755..100644
--- a/docs/html/google/play/billing/v2/billing_subscriptions.jd
+++ b/docs/html/google/play/billing/v2/billing_subscriptions.jd
diff --git a/docs/html/guide/appendix/faq/troubleshooting.jd b/docs/html/guide/appendix/faq/troubleshooting.jd
index e3a9e4182..e3a9e4182 100755..100644
--- a/docs/html/guide/appendix/faq/troubleshooting.jd
+++ b/docs/html/guide/appendix/faq/troubleshooting.jd
diff --git a/docs/html/guide/topics/manifest/uses-configuration-element.jd b/docs/html/guide/topics/manifest/uses-configuration-element.jd
index 810975e..810975e 100755..100644
--- a/docs/html/guide/topics/manifest/uses-configuration-element.jd
+++ b/docs/html/guide/topics/manifest/uses-configuration-element.jd
diff --git a/docs/html/guide/topics/resources/localization.jd b/docs/html/guide/topics/resources/localization.jd
index 480fe65..480fe65 100755..100644
--- a/docs/html/guide/topics/resources/localization.jd
+++ b/docs/html/guide/topics/resources/localization.jd
diff --git a/docs/html/guide/topics/resources/resources-i18n.jd b/docs/html/guide/topics/resources/resources-i18n.jd
index e1c96fb..e1c96fb 100755..100644
--- a/docs/html/guide/topics/resources/resources-i18n.jd
+++ b/docs/html/guide/topics/resources/resources-i18n.jd
diff --git a/docs/html/guide/topics/ui/declaring-layout.jd b/docs/html/guide/topics/ui/declaring-layout.jd
index ab674e6..6398646 100644
--- a/docs/html/guide/topics/ui/declaring-layout.jd
+++ b/docs/html/guide/topics/ui/declaring-layout.jd
@@ -394,7 +394,7 @@ subclasses {@link android.widget.AdapterView} to populate the layout with views
subclass of the {@link android.widget.AdapterView} class uses an {@link android.widget.Adapter} to
bind data to its layout. The {@link android.widget.Adapter} behaves as a middle-man between the data
source and the {@link android.widget.AdapterView} layout—the {@link android.widget.Adapter}
-retreives the data (from a source such as an array or a database query) and converts each entry
+retrieves the data (from a source such as an array or a database query) and converts each entry
into a view that can be added into the {@link android.widget.AdapterView} layout.</p>
<p>Common layouts backed by an adapter include:</p>
diff --git a/docs/html/guide/topics/ui/images/hello-gallery.png b/docs/html/guide/topics/ui/images/hello-gallery.png
index 22d1eaf..22d1eaf 100755..100644
--- a/docs/html/guide/topics/ui/images/hello-gallery.png
+++ b/docs/html/guide/topics/ui/images/hello-gallery.png
Binary files differ
diff --git a/docs/html/guide/topics/ui/images/hello-gridview.png b/docs/html/guide/topics/ui/images/hello-gridview.png
index 2def0df..2def0df 100755..100644
--- a/docs/html/guide/topics/ui/images/hello-gridview.png
+++ b/docs/html/guide/topics/ui/images/hello-gridview.png
Binary files differ
diff --git a/docs/html/guide/topics/ui/images/hello-linearlayout.png b/docs/html/guide/topics/ui/images/hello-linearlayout.png
index dfef819..dfef819 100755..100644
--- a/docs/html/guide/topics/ui/images/hello-linearlayout.png
+++ b/docs/html/guide/topics/ui/images/hello-linearlayout.png
Binary files differ
diff --git a/docs/html/guide/topics/ui/images/hello-relativelayout.png b/docs/html/guide/topics/ui/images/hello-relativelayout.png
index ec4d9d4..ec4d9d4 100755..100644
--- a/docs/html/guide/topics/ui/images/hello-relativelayout.png
+++ b/docs/html/guide/topics/ui/images/hello-relativelayout.png
Binary files differ
diff --git a/docs/html/guide/topics/ui/images/hello-tablelayout.png b/docs/html/guide/topics/ui/images/hello-tablelayout.png
index 3d80e7f..3d80e7f 100755..100644
--- a/docs/html/guide/topics/ui/images/hello-tablelayout.png
+++ b/docs/html/guide/topics/ui/images/hello-tablelayout.png
Binary files differ
diff --git a/docs/html/images/billing_check_supported.png b/docs/html/images/billing_check_supported.png
index d661f7f..d661f7f 100755..100644
--- a/docs/html/images/billing_check_supported.png
+++ b/docs/html/images/billing_check_supported.png
Binary files differ
diff --git a/docs/html/images/billing_checkout_flow.png b/docs/html/images/billing_checkout_flow.png
index 5b446be..5b446be 100755..100644
--- a/docs/html/images/billing_checkout_flow.png
+++ b/docs/html/images/billing_checkout_flow.png
Binary files differ
diff --git a/docs/html/images/billing_list_form.png b/docs/html/images/billing_list_form.png
index de7ea22..de7ea22 100755..100644
--- a/docs/html/images/billing_list_form.png
+++ b/docs/html/images/billing_list_form.png
Binary files differ
diff --git a/docs/html/images/billing_list_form_2.png b/docs/html/images/billing_list_form_2.png
index d321a20..d321a20 100755..100644
--- a/docs/html/images/billing_list_form_2.png
+++ b/docs/html/images/billing_list_form_2.png
Binary files differ
diff --git a/docs/html/images/billing_product_list.png b/docs/html/images/billing_product_list.png
index a89f21b..a89f21b 100755..100644
--- a/docs/html/images/billing_product_list.png
+++ b/docs/html/images/billing_product_list.png
Binary files differ
diff --git a/docs/html/images/billing_product_list_entry.png b/docs/html/images/billing_product_list_entry.png
index df3f9a8..df3f9a8 100755..100644
--- a/docs/html/images/billing_product_list_entry.png
+++ b/docs/html/images/billing_product_list_entry.png
Binary files differ
diff --git a/docs/html/images/billing_refund.png b/docs/html/images/billing_refund.png
index 09fc33c..09fc33c 100755..100644
--- a/docs/html/images/billing_refund.png
+++ b/docs/html/images/billing_refund.png
Binary files differ
diff --git a/docs/html/images/billing_request_purchase.png b/docs/html/images/billing_request_purchase.png
index c84016e..c84016e 100755..100644
--- a/docs/html/images/billing_request_purchase.png
+++ b/docs/html/images/billing_request_purchase.png
Binary files differ
diff --git a/docs/html/images/billing_restore_transactions.png b/docs/html/images/billing_restore_transactions.png
index 7911304..7911304 100755..100644
--- a/docs/html/images/billing_restore_transactions.png
+++ b/docs/html/images/billing_restore_transactions.png
Binary files differ
diff --git a/docs/html/images/billing_test_flow.png b/docs/html/images/billing_test_flow.png
index 9db8cd9..9db8cd9 100755..100644
--- a/docs/html/images/billing_test_flow.png
+++ b/docs/html/images/billing_test_flow.png
Binary files differ
diff --git a/docs/html/images/custom_message.png b/docs/html/images/custom_message.png
index 00b7632..00b7632 100755..100644
--- a/docs/html/images/custom_message.png
+++ b/docs/html/images/custom_message.png
Binary files differ
diff --git a/docs/html/images/custom_toast.png b/docs/html/images/custom_toast.png
index 230625a..230625a 100755..100644
--- a/docs/html/images/custom_toast.png
+++ b/docs/html/images/custom_toast.png
Binary files differ
diff --git a/docs/html/images/developing/developing_overview.png b/docs/html/images/developing/developing_overview.png
index ab09407..ab09407 100755..100644
--- a/docs/html/images/developing/developing_overview.png
+++ b/docs/html/images/developing/developing_overview.png
Binary files differ
diff --git a/docs/html/images/drm_arch.png b/docs/html/images/drm_arch.png
index 1696a97..1696a97 100755..100644
--- a/docs/html/images/drm_arch.png
+++ b/docs/html/images/drm_arch.png
Binary files differ
diff --git a/docs/html/images/jet/jc_audition_wnd.png b/docs/html/images/jet/jc_audition_wnd.png
index 43f0fb1..43f0fb1 100755..100644
--- a/docs/html/images/jet/jc_audition_wnd.png
+++ b/docs/html/images/jet/jc_audition_wnd.png
Binary files differ
diff --git a/docs/html/images/jet/jc_event_wnd.png b/docs/html/images/jet/jc_event_wnd.png
index 807797e..807797e 100755..100644
--- a/docs/html/images/jet/jc_event_wnd.png
+++ b/docs/html/images/jet/jc_event_wnd.png
Binary files differ
diff --git a/docs/html/images/jet/jc_main_wnd.png b/docs/html/images/jet/jc_main_wnd.png
index 29c47ec..29c47ec 100755..100644
--- a/docs/html/images/jet/jc_main_wnd.png
+++ b/docs/html/images/jet/jc_main_wnd.png
Binary files differ
diff --git a/docs/html/images/jet/jc_moveseg_wnd.png b/docs/html/images/jet/jc_moveseg_wnd.png
index 690dcad..690dcad 100755..100644
--- a/docs/html/images/jet/jc_moveseg_wnd.png
+++ b/docs/html/images/jet/jc_moveseg_wnd.png
Binary files differ
diff --git a/docs/html/images/jet/jc_open_dlg.png b/docs/html/images/jet/jc_open_dlg.png
index 0d5a14d..0d5a14d 100755..100644
--- a/docs/html/images/jet/jc_open_dlg.png
+++ b/docs/html/images/jet/jc_open_dlg.png
Binary files differ
diff --git a/docs/html/images/jet/jc_rep_wnd.png b/docs/html/images/jet/jc_rep_wnd.png
index ca200d1..ca200d1 100755..100644
--- a/docs/html/images/jet/jc_rep_wnd.png
+++ b/docs/html/images/jet/jc_rep_wnd.png
Binary files differ
diff --git a/docs/html/images/jet/jc_repseg_wnd.png b/docs/html/images/jet/jc_repseg_wnd.png
index 7867902..7867902 100755..100644
--- a/docs/html/images/jet/jc_repseg_wnd.png
+++ b/docs/html/images/jet/jc_repseg_wnd.png
Binary files differ
diff --git a/docs/html/images/jet/jc_seg_wnd.png b/docs/html/images/jet/jc_seg_wnd.png
index b0434d7..b0434d7 100755..100644
--- a/docs/html/images/jet/jc_seg_wnd.png
+++ b/docs/html/images/jet/jc_seg_wnd.png
Binary files differ
diff --git a/docs/html/images/notifications_window.png b/docs/html/images/notifications_window.png
index 78e0c8a..78e0c8a 100755..100644
--- a/docs/html/images/notifications_window.png
+++ b/docs/html/images/notifications_window.png
Binary files differ
diff --git a/docs/html/images/options_menu.png b/docs/html/images/options_menu.png
index 6c49906..6c49906 100755..100644
--- a/docs/html/images/options_menu.png
+++ b/docs/html/images/options_menu.png
Binary files differ
diff --git a/docs/html/images/publishing/publishing_android_market.png b/docs/html/images/publishing/publishing_android_market.png
index aa591ef..aa591ef 100755..100644
--- a/docs/html/images/publishing/publishing_android_market.png
+++ b/docs/html/images/publishing/publishing_android_market.png
Binary files differ
diff --git a/docs/html/images/publishing/publishing_overview.png b/docs/html/images/publishing/publishing_overview.png
index 0d88b4f..0d88b4f 100755..100644
--- a/docs/html/images/publishing/publishing_overview.png
+++ b/docs/html/images/publishing/publishing_overview.png
Binary files differ
diff --git a/docs/html/images/publishing/publishing_overview_prep.png b/docs/html/images/publishing/publishing_overview_prep.png
index 7a300f4..7a300f4 100755..100644
--- a/docs/html/images/publishing/publishing_overview_prep.png
+++ b/docs/html/images/publishing/publishing_overview_prep.png
Binary files differ
diff --git a/docs/html/images/publishing/publishing_preparing.png b/docs/html/images/publishing/publishing_preparing.png
index 40c0ac6..40c0ac6 100755..100644
--- a/docs/html/images/publishing/publishing_preparing.png
+++ b/docs/html/images/publishing/publishing_preparing.png
Binary files differ
diff --git a/docs/html/images/publishing/publishing_via_email.png b/docs/html/images/publishing/publishing_via_email.png
index d367747..d367747 100755..100644
--- a/docs/html/images/publishing/publishing_via_email.png
+++ b/docs/html/images/publishing/publishing_via_email.png
Binary files differ
diff --git a/docs/html/images/radio_buttons.png b/docs/html/images/radio_buttons.png
index 415ccca..415ccca 100755..100644
--- a/docs/html/images/radio_buttons.png
+++ b/docs/html/images/radio_buttons.png
Binary files differ
diff --git a/docs/html/images/resources/arrow.png b/docs/html/images/resources/arrow.png
index 78ad542..78ad542 100755..100644
--- a/docs/html/images/resources/arrow.png
+++ b/docs/html/images/resources/arrow.png
Binary files differ
diff --git a/docs/html/images/resources/right-arrow.png b/docs/html/images/resources/right-arrow.png
index 092f029..092f029 100755..100644
--- a/docs/html/images/resources/right-arrow.png
+++ b/docs/html/images/resources/right-arrow.png
Binary files differ
diff --git a/docs/html/images/status_bar.png b/docs/html/images/status_bar.png
index 420bb03..420bb03 100755..100644
--- a/docs/html/images/status_bar.png
+++ b/docs/html/images/status_bar.png
Binary files differ
diff --git a/docs/html/images/testing/android_test_framework.png b/docs/html/images/testing/android_test_framework.png
index 459975c..459975c 100755..100644
--- a/docs/html/images/testing/android_test_framework.png
+++ b/docs/html/images/testing/android_test_framework.png
Binary files differ
diff --git a/docs/html/images/training/ads-close-to-button.png b/docs/html/images/training/ads-close-to-button.png
index fcb65aa..fcb65aa 100755..100644
--- a/docs/html/images/training/ads-close-to-button.png
+++ b/docs/html/images/training/ads-close-to-button.png
Binary files differ
diff --git a/docs/html/images/training/ads-cover-content.png b/docs/html/images/training/ads-cover-content.png
index f284d65..f284d65 100755..100644
--- a/docs/html/images/training/ads-cover-content.png
+++ b/docs/html/images/training/ads-cover-content.png
Binary files differ
diff --git a/docs/html/images/training/ads-eclipse-build-path.png b/docs/html/images/training/ads-eclipse-build-path.png
index fe720fd..fe720fd 100755..100644
--- a/docs/html/images/training/ads-eclipse-build-path.png
+++ b/docs/html/images/training/ads-eclipse-build-path.png
Binary files differ
diff --git a/docs/html/images/training/ads-top-banner.png b/docs/html/images/training/ads-top-banner.png
index 8dffe8d..8dffe8d 100755..100644
--- a/docs/html/images/training/ads-top-banner.png
+++ b/docs/html/images/training/ads-top-banner.png
Binary files differ
diff --git a/docs/html/images/training/button.png b/docs/html/images/training/button.png
index 1a7944f..1a7944f 100755..100644
--- a/docs/html/images/training/button.png
+++ b/docs/html/images/training/button.png
Binary files differ
diff --git a/docs/html/images/training/button_with_marks.png b/docs/html/images/training/button_with_marks.png
index 06e0720..06e0720 100755..100644
--- a/docs/html/images/training/button_with_marks.png
+++ b/docs/html/images/training/button_with_marks.png
Binary files differ
diff --git a/docs/html/images/training/buttons_stretched.png b/docs/html/images/training/buttons_stretched.png
index bb67419..bb67419 100755..100644
--- a/docs/html/images/training/buttons_stretched.png
+++ b/docs/html/images/training/buttons_stretched.png
Binary files differ
diff --git a/docs/html/images/training/cool-places.png b/docs/html/images/training/cool-places.png
index 769b5b7..769b5b7 100755..100644
--- a/docs/html/images/training/cool-places.png
+++ b/docs/html/images/training/cool-places.png
Binary files differ
diff --git a/docs/html/images/training/device-mgmt-activate-device-admin.png b/docs/html/images/training/device-mgmt-activate-device-admin.png
index 1be1831..1be1831 100755..100644
--- a/docs/html/images/training/device-mgmt-activate-device-admin.png
+++ b/docs/html/images/training/device-mgmt-activate-device-admin.png
Binary files differ
diff --git a/docs/html/images/training/panoramio-grid.png b/docs/html/images/training/panoramio-grid.png
index 45c0eb5..45c0eb5 100755..100644
--- a/docs/html/images/training/panoramio-grid.png
+++ b/docs/html/images/training/panoramio-grid.png
Binary files differ
diff --git a/docs/html/images/ui/clipboard/copy_paste_framework.png b/docs/html/images/ui/clipboard/copy_paste_framework.png
index 57facaa..57facaa 100755..100644
--- a/docs/html/images/ui/clipboard/copy_paste_framework.png
+++ b/docs/html/images/ui/clipboard/copy_paste_framework.png
Binary files differ
diff --git a/docs/html/images/ui/notifications/custom_message.png b/docs/html/images/ui/notifications/custom_message.png
index 00b7632..00b7632 100755..100644
--- a/docs/html/images/ui/notifications/custom_message.png
+++ b/docs/html/images/ui/notifications/custom_message.png
Binary files differ
diff --git a/docs/html/images/ui/notifications/notifications_window.png b/docs/html/images/ui/notifications/notifications_window.png
index 0354ee9..0354ee9 100755..100644
--- a/docs/html/images/ui/notifications/notifications_window.png
+++ b/docs/html/images/ui/notifications/notifications_window.png
Binary files differ
diff --git a/docs/html/images/ui/notifications/status_bar.png b/docs/html/images/ui/notifications/status_bar.png
index f0240a5..f0240a5 100755..100644
--- a/docs/html/images/ui/notifications/status_bar.png
+++ b/docs/html/images/ui/notifications/status_bar.png
Binary files differ
diff --git a/docs/html/resources/images/KeyChainDemo2.png b/docs/html/resources/images/KeyChainDemo2.png
index e181e58..e181e58 100755..100644
--- a/docs/html/resources/images/KeyChainDemo2.png
+++ b/docs/html/resources/images/KeyChainDemo2.png
Binary files differ
diff --git a/docs/html/resources/images/KeyChainDemo3.png b/docs/html/resources/images/KeyChainDemo3.png
index acfdd89..acfdd89 100755..100644
--- a/docs/html/resources/images/KeyChainDemo3.png
+++ b/docs/html/resources/images/KeyChainDemo3.png
Binary files differ
diff --git a/docs/html/resources/images/KeyChainDemo4.png b/docs/html/resources/images/KeyChainDemo4.png
index a9101ab..a9101ab 100755..100644
--- a/docs/html/resources/images/KeyChainDemo4.png
+++ b/docs/html/resources/images/KeyChainDemo4.png
Binary files differ
diff --git a/docs/html/resources/images/SipDemo.png b/docs/html/resources/images/SipDemo.png
index 999bea9..999bea9 100755..100644
--- a/docs/html/resources/images/SipDemo.png
+++ b/docs/html/resources/images/SipDemo.png
Binary files differ
diff --git a/docs/html/resources/images/vpn-confirmation.png b/docs/html/resources/images/vpn-confirmation.png
index ae2e583..ae2e583 100755..100644
--- a/docs/html/resources/images/vpn-confirmation.png
+++ b/docs/html/resources/images/vpn-confirmation.png
Binary files differ
diff --git a/docs/html/tools/debugging/debugging-tracing.jd b/docs/html/tools/debugging/debugging-tracing.jd
index efef64a..8653da6 100644
--- a/docs/html/tools/debugging/debugging-tracing.jd
+++ b/docs/html/tools/debugging/debugging-tracing.jd
@@ -18,15 +18,6 @@ parent.link=index.html
</ol>
</li>
- <li>
- <a href="#format">Traceview File Format</a>
- <ol>
- <li><a href="#datafileformat">Data File Format</a></li>
-
- <li><a href="#keyfileformat">Key File Format</a></li>
- </ol>
- </li>
-
<li><a href="#creatingtracefiles">Creating Trace Files</a></li>
<li><a href="#copyingfiles">Copying Trace Files to a Host Machine</a></li>
@@ -95,114 +86,6 @@ parent.link=index.html
height="630" />
<p class="img-caption"><strong>Figure 2.</strong> The Traceview Profile Panel</p>
- <h2 id="format">Traceview File Format</h2>
-
- <p>Tracing creates two distinct pieces of output: a <em>data</em> file, which holds the trace
- data, and a <em>key</em> file, which provides a mapping from binary identifiers to thread and
- method names. The files are concatenated when tracing completes, into a single <em>.trace</em>
- file.</p>
-
- <p class="note"><strong>Note:</strong> The previous version of Traceview did not concatenate
- these files for you. If you have old key and data files that you'd still like to trace, you can
- concatenate them yourself with <code>cat mytrace.key mytrace.data &gt;
- mytrace.trace</code>.</p>
-
- <h3 id="datafileformat">Data File Format</h3>
-
- <p>The data file is binary, structured as follows (all values are stored in little-endian
- order):</p>
- <pre>
-* File format:
-* header
-* record 0
-* record 1
-* ...
-*
-* Header format:
-* u4 magic 0x574f4c53 ('SLOW')
-* u2 version
-* u2 offset to data
-* u8 start date/time in usec
-*
-* Record format:
-* u1 thread ID
-* u4 method ID | method action
-* u4 time delta since start, in usec
-</pre>
-
- <p>The application is expected to parse all of the header fields, then seek to "offset to data"
- from the start of the file. From there it just reads 9-byte records until EOF is reached.</p>
-
- <p><em>u8 start date/time in usec</em> is the output from <code>gettimeofday()</code>. It's mainly there so
- that you can tell if the output was generated yesterday or three months ago.</p>
-
- <p><em>method action</em> sits in the two least-significant bits of the <em>method</em> word. The
- currently defined meanings are:</p>
-
- <ul>
- <li>0 - method entry</li>
-
- <li>1 - method exit</li>
-
- <li>2 - method "exited" when unrolled by exception handling</li>
-
- <li>3 - (reserved)</li>
- </ul>
-
- <p>An unsigned 32-bit integer can hold about 70 minutes of time in microseconds.</p>
-
- <h3 id="keyfileformat">Key File Format</h3>
-
- <p>The key file is a plain text file divided into three sections. Each section starts with a
- keyword that begins with '*'. If you see a '*' at the start of a line, you have found the start
- of a new section.</p>
-
- <p>An example file might look like this:</p>
- <pre>
-*version
-1
-clock=global
-*threads
-1 main
-6 JDWP Handler
-5 Async GC
-4 Reference Handler
-3 Finalizer
-2 Signal Handler
-*methods
-0x080f23f8 java/io/PrintStream write ([BII)V
-0x080f25d4 java/io/PrintStream print (Ljava/lang/String;)V
-0x080f27f4 java/io/PrintStream println (Ljava/lang/String;)V
-0x080da620 java/lang/RuntimeException &lt;init&gt; ()V
-[...]
-0x080f630c android/os/Debug startMethodTracing ()V
-0x080f6350 android/os/Debug startMethodTracing (Ljava/lang/String;Ljava/lang/String;I)V
-*end
-</pre>
-<p>The following list describes the major sections of a key file:</p>
- <dl>
- <dt><em>version section</em></dt>
-
- <dd>The first line is the file version number, currently 1. The second line,
- <code>clock=global</code>, indicates that we use a common clock across all threads. A future
- version may use per-thread CPU time counters that are independent for every thread.</dd>
-
- <dt><em>threads section</em></dt>
-
- <dd>One line per thread. Each line consists of two parts: the thread ID, followed by a tab,
- followed by the thread name. There are few restrictions on what a valid thread name is, so
- include everything to the end of the line.</dd>
-
- <dt><em>methods section</em></dt>
-
- <dd>One line per method entry or exit. A line consists of four pieces, separated by tab marks:
- <em>method-ID</em> [TAB] <em>class-name</em> [TAB] <em>method-name</em> [TAB]
- <em>signature</em> . Only the methods that were actually entered or exited are included in the
- list. Note that all three identifiers are required to uniquely identify a method.</dd>
- </dl>
-
- <p>Neither the threads nor methods sections are sorted.</p>
-
<h2 id="creatingtracefiles">Creating Trace Files</h2>
<p>To use Traceview, you need to generate log files containing the trace information you want to
@@ -268,9 +151,6 @@ clock=global
<p>When using the Android emulator, you must specify an SD card when you create your AVD because the trace files
are written to the SD card. Your application must have permission to write to the SD card as well.
- <p>The format of the trace files is previously described <a href="#format">in this
- document</a>.</p>
-
<h2 id="copyingfiles">Copying Trace Files to a Host Machine</h2>
<p>After your application has run and the system has created your trace files
@@ -296,7 +176,7 @@ traceview /tmp/calc
You can use the Proguard <code>mapping.txt</code> file to figure out the original unobfuscated names. For more information
on this file, see the <a href="{@docRoot}tools/help/proguard.html">Proguard</a> documentation.</p>
- <h2 id="dmtracedump">Using dmtracdedump</h2>
+ <h2 id="dmtracedump">Using dmtracedump</h2>
<p><code>dmtracedump</code> is a tool that gives you an alternate way of generating
graphical call-stack diagrams from trace log files. The tool uses the Graphviz Dot utility to
@@ -398,4 +278,4 @@ dmtracedump [-ho] [-s sortable] [-d trace-base-name] [-g outfile] &lt;trace-base
</ol>
</dd>
- </dl> \ No newline at end of file
+ </dl>
diff --git a/docs/html/tools/publishing/publishing_overview.jd b/docs/html/tools/publishing/publishing_overview.jd
index ea01e20..ea01e20 100755..100644
--- a/docs/html/tools/publishing/publishing_overview.jd
+++ b/docs/html/tools/publishing/publishing_overview.jd
diff --git a/docs/html/tools/testing/testing_android.jd b/docs/html/tools/testing/testing_android.jd
index 10843e8..10843e8 100755..100644
--- a/docs/html/tools/testing/testing_android.jd
+++ b/docs/html/tools/testing/testing_android.jd
diff --git a/docs/html/training/animation/anim_card_flip.mp4 b/docs/html/training/animation/anim_card_flip.mp4
index e885f98..e885f98 100755..100644
--- a/docs/html/training/animation/anim_card_flip.mp4
+++ b/docs/html/training/animation/anim_card_flip.mp4
Binary files differ
diff --git a/docs/html/training/animation/anim_card_flip.ogv b/docs/html/training/animation/anim_card_flip.ogv
index 33cd86c..33cd86c 100755..100644
--- a/docs/html/training/animation/anim_card_flip.ogv
+++ b/docs/html/training/animation/anim_card_flip.ogv
Binary files differ
diff --git a/docs/html/training/animation/anim_card_flip.webm b/docs/html/training/animation/anim_card_flip.webm
index a670d78..a670d78 100755..100644
--- a/docs/html/training/animation/anim_card_flip.webm
+++ b/docs/html/training/animation/anim_card_flip.webm
Binary files differ
diff --git a/docs/html/training/animation/anim_screenslide.mp4 b/docs/html/training/animation/anim_screenslide.mp4
index 3e65026..3e65026 100755..100644
--- a/docs/html/training/animation/anim_screenslide.mp4
+++ b/docs/html/training/animation/anim_screenslide.mp4
Binary files differ
diff --git a/docs/html/training/animation/anim_screenslide.ogv b/docs/html/training/animation/anim_screenslide.ogv
index c45ebd4..c45ebd4 100755..100644
--- a/docs/html/training/animation/anim_screenslide.ogv
+++ b/docs/html/training/animation/anim_screenslide.ogv
Binary files differ
diff --git a/docs/html/training/animation/anim_screenslide.webm b/docs/html/training/animation/anim_screenslide.webm
index c72adbc..c72adbc 100755..100644
--- a/docs/html/training/animation/anim_screenslide.webm
+++ b/docs/html/training/animation/anim_screenslide.webm
Binary files differ