Scott Main b80d578c8f am 2da041f0: am 0622ed7f: am 0034beab: resolved conflicts for merge of 783e115b to jb-mr1-dev ...

* commit '2da041f09d5d68d79b1455aedce6527ea6c5dd89':
  implement new organization for Training classes This also moves a few of the documents from API Guides > Best Practices into the new courses for best practices. This is also dependent on CL Ieac8a97a8d6fda41a3682241901150cfe16afc4d which generates the list of classes/lessons on each course landing page.

2012-11-14 19:17:27 -08:00

..

about

Massive clobber of all HTML files in developer docs for new site design

2012-06-21 21:27:30 -07:00

activity_task_design

…

admin

Doc change: Updating device-admin with camera info.

2011-11-03 16:07:05 -07:00

animation

Doc change: updating animation framework topic

2011-02-10 21:22:33 -08:00

brand

updates to the brand guidelines, based on the partner toolkit

2012-09-26 12:17:49 -07:00

develop

Massive clobber of all HTML files in developer docs for new site design

2012-06-21 21:27:30 -07:00

developing

Correct executable bit for source files

2012-11-07 10:27:31 -08:00

distribute

Doc change: Add core quality and tablet quality docs and spotlight.

2012-10-05 18:47:10 -07:00

efficient-downloads

Docs: Added efficient downloads Android U class

2012-03-23 11:32:02 -07:00

fundamentals

Correct executable bit for source files

2012-11-07 10:27:31 -08:00

gcm

Doc update: Adding new GCM docs.

2012-06-26 14:55:45 -07:00

gltracer

docs: GL Tracer, Device Monitor Tools for SDK r20

2012-06-26 16:27:18 -07:00

hello_l10n

Correct executable bit for source files

2012-11-07 10:27:31 -08:00

home

docs: add jelly bean to homepage

2012-06-22 21:21:35 -07:00

icon_design

Update Icon Guidelines and Icon Templates Pack for ICS

2011-10-07 15:23:18 -07:00

jet

Correct executable bit for source files

2012-11-07 10:27:31 -08:00

location

…

market

Massive clobber of all HTML files in developer docs for new site design

2012-06-21 21:27:30 -07:00

menu_design

…

opengl

Massive clobber of all HTML files in developer docs for new site design

2012-06-21 21:27:30 -07:00

practices

docs: add guide for optimizing tablet apps for handsets

2011-10-26 15:21:40 -07:00

preview_hc

…

providers

Massive clobber of all HTML files in developer docs for new site design

2012-06-21 21:27:30 -07:00

publishing

Correct executable bit for source files

2012-11-07 10:27:31 -08:00

resources

Correct executable bit for source files

2012-11-07 10:27:31 -08:00

screens_support

Massive clobber of all HTML files in developer docs for new site design

2012-06-21 21:27:30 -07:00

search

…

systrace

cherrypick from jb-dev Change-Id: Idecee238d8872ca1c32a80d13ad61bacf89c39f7

2012-09-25 17:52:02 -07:00

testing

am 36c7e590: am 01774bd0: am fabcff5c: Merge "docs: Added new docs for uiautomator testing framework." into jb-mr1-dev

2012-11-12 15:09:50 -08:00

tools

docs: update Tools landing page with info for developer options

2012-11-09 20:50:52 -08:00

training

Correct executable bit for source files

2012-11-07 10:27:31 -08:00

ui

am 768d9e1a: Merge "Correct executable bit for source files"

2012-11-07 11:52:12 -08:00

webapps

Massive clobber of all HTML files in developer docs for new site design

2012-06-21 21:27:30 -07:00

widget_design

Update Widget Design guidelines for ICS

2011-09-28 15:49:09 -07:00

activity_fragment_lifecycle.png

Massive clobber of all HTML files in developer docs for new site design

2012-06-21 21:27:30 -07:00

activity_lifecycle.graffle

docs: Update lifecycle diagrams to use new omnigraffle designs;

2012-01-03 18:27:23 -08:00

activity_lifecycle.png

Massive clobber of all HTML files in developer docs for new site design

2012-06-21 21:27:30 -07:00

android_adc.gif

…

android_icon_125.png

…

android-logo.png

Massive clobber of all HTML files in developer docs for new site design

2012-06-21 21:27:30 -07:00

anr.png

implement new organization for Training classes

2012-11-14 17:30:24 -08:00

appwidget_collections.png

Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003db0f45264ca34e513ad132cc089cf62d

2011-05-17 17:21:00 -07:00

appwidget.png

Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003db0f45264ca34e513ad132cc089cf62d

2011-05-17 17:21:00 -07:00

avd-manager.png

docs: update various SDK and AVD Manager screenshots

2012-03-14 16:16:18 -07:00

axis_device.png

…

axis_globe_inverted.png

…

axis_globe.png

…

billing_arch.png

Correct executable bit for source files

2012-11-07 10:27:31 -08:00

billing_check_supported.png

Correct executable bit for source files

2012-11-07 10:27:31 -08:00

billing_checkout_flow.png

Correct executable bit for source files

2012-11-07 10:27:31 -08:00

billing_list_form_2.png

Correct executable bit for source files

2012-11-07 10:27:31 -08:00

billing_list_form.png

Correct executable bit for source files

2012-11-07 10:27:31 -08:00

billing_package.png

docs: update various SDK and AVD Manager screenshots

2012-03-14 16:16:18 -07:00

billing_product_list_entry.png

Correct executable bit for source files

2012-11-07 10:27:31 -08:00

billing_product_list.png

Correct executable bit for source files

2012-11-07 10:27:31 -08:00

billing_public_key.png

Correct executable bit for source files

2012-11-07 10:27:31 -08:00

billing_refund.png

Correct executable bit for source files

2012-11-07 10:27:31 -08:00

billing_request_purchase.png

Correct executable bit for source files

2012-11-07 10:27:31 -08:00

billing_restore_transactions.png

Correct executable bit for source files

2012-11-07 10:27:31 -08:00

billing_subscription_flow.png

Massive clobber of all HTML files in developer docs for new site design

2012-06-21 21:27:30 -07:00

billing_test_flow.png

Correct executable bit for source files

2012-11-07 10:27:31 -08:00

binder_rpc.png

…

bt_enable_discoverable.png

…

bt_enable_request.png

…

bt_pairing_request.png

…

build-simplified.png

Doc change: restructuring changes for building and running section of dev guide

2010-12-23 13:06:56 -08:00

build.png

Doc change: restructuring changes for building and running section of dev guide

2010-12-23 13:06:56 -08:00

c2dm.png

docs: add landing for gcm

2012-06-26 16:46:21 -07:00

canvas.png

docs: cherrypick from hc-mr2 Change-Id: I42d2befab1c848dc0b9aa5b4c5ac25ee50bd9a7b

2011-08-12 13:38:45 -07:00

content_uri.png

…

custom_message.png

Correct executable bit for source files

2012-11-07 10:27:31 -08:00

custom_toast.png

Correct executable bit for source files

2012-11-07 10:27:31 -08:00

dac-design-icon.png

Massive clobber of all HTML files in developer docs for new site design

2012-06-21 21:27:30 -07:00

debug-ddms.png

Doc change: Debugging section of dev guide restructuring

2010-12-29 12:43:23 -08:00

debugging-tall.png

Massive clobber of all HTML files in developer docs for new site design

2012-06-21 21:27:30 -07:00

debugging.png

Doc change: Debugging section of dev guide restructuring

2010-12-29 12:43:23 -08:00

designing_ui_layout_example.png

…

designing_ui_relative_layout.png

…

develop-placeholder.png

Massive clobber of all HTML files in developer docs for new site design

2012-06-21 21:27:30 -07:00

draw9patch-bad.png

…

draw9patch-norm.png

…

drm_arch.png

Correct executable bit for source files

2012-11-07 10:27:31 -08:00

e-mini-hvga-l.png

…

e-mini-hvga-p.png

…

e-mini-qvga-l.png

…

e-mini-qvga-p.png

…

editorschoice_ann.png

Massive clobber of all HTML files in developer docs for new site design

2012-06-21 21:27:30 -07:00

emulator-hvga-p.png

…

emulator-wvga800l.png

docs: Emulator Hardware Acceleration docs for SDK r17

2012-03-16 10:21:32 -07:00

emulator.png

…

external-display.png

Doc change: image optimizations for docs.

2012-11-13 05:37:11 -08:00

fragment_lifecycle.png

Massive clobber of all HTML files in developer docs for new site design

2012-06-21 21:27:30 -07:00

google-apis.png

docs: add landing for gcm

2012-06-26 16:46:21 -07:00

gp-apps-home.png

Massive clobber of all HTML files in developer docs for new site design

2012-06-21 21:27:30 -07:00

gp-buyer-currency.png

Massive clobber of all HTML files in developer docs for new site design

2012-06-21 21:27:30 -07:00

gp-collectibles.png

Massive clobber of all HTML files in developer docs for new site design

2012-06-21 21:27:30 -07:00

gp-dc-countries.png

Massive clobber of all HTML files in developer docs for new site design

2012-06-21 21:27:30 -07:00

gp-dc-details.png

Massive clobber of all HTML files in developer docs for new site design

2012-06-21 21:27:30 -07:00

gp-dc-home.png

Massive clobber of all HTML files in developer docs for new site design

2012-06-21 21:27:30 -07:00

gp-dc-profile.png

Massive clobber of all HTML files in developer docs for new site design

2012-06-21 21:27:30 -07:00

gp-dc-reviews.png

Massive clobber of all HTML files in developer docs for new site design

2012-06-21 21:27:30 -07:00

gp-dc-stats-mini.png

Massive clobber of all HTML files in developer docs for new site design

2012-06-21 21:27:30 -07:00

gp-dc-stats.png

Massive clobber of all HTML files in developer docs for new site design

2012-06-21 21:27:30 -07:00

gp-details-pages-magicpiano.png

Massive clobber of all HTML files in developer docs for new site design

2012-06-21 21:27:30 -07:00

gp-details-ww-purchase.png

Doc change: Add Google Play balance back into monetizing docs.

2012-07-02 11:03:31 -07:00

gp-details-ww.png

Massive clobber of all HTML files in developer docs for new site design

2012-06-21 21:27:30 -07:00

gp-devconsole-home.png

Massive clobber of all HTML files in developer docs for new site design

2012-06-21 21:27:30 -07:00

gp-device.png

Massive clobber of all HTML files in developer docs for new site design

2012-06-21 21:27:30 -07:00

gp-games-home.png

Massive clobber of all HTML files in developer docs for new site design

2012-06-21 21:27:30 -07:00

gp-growth-downloads.png

Massive clobber of all HTML files in developer docs for new site design

2012-06-21 21:27:30 -07:00

gp-rating-web.png

Massive clobber of all HTML files in developer docs for new site design

2012-06-21 21:27:30 -07:00

gp-sendto.png

Massive clobber of all HTML files in developer docs for new site design

2012-06-21 21:27:30 -07:00

gp-subs.png

Massive clobber of all HTML files in developer docs for new site design

2012-06-21 21:27:30 -07:00

gp-supported-dev-requirements.png

Massive clobber of all HTML files in developer docs for new site design

2012-06-21 21:27:30 -07:00

gp-tab.png

Massive clobber of all HTML files in developer docs for new site design

2012-06-21 21:27:30 -07:00

gp-top-new-paid.png

Massive clobber of all HTML files in developer docs for new site design

2012-06-21 21:27:30 -07:00

gpp-cat-feature280-photo.png

Massive clobber of all HTML files in developer docs for new site design

2012-06-21 21:27:30 -07:00

gpp-cat-feature280-puzzle.png

Massive clobber of all HTML files in developer docs for new site design

2012-06-21 21:27:30 -07:00

gpp-cat-feature280-sports.png

Massive clobber of all HTML files in developer docs for new site design

2012-06-21 21:27:30 -07:00

gradient_drawable.png

…

hello_world_0.png

…

hello_world_1.png

…

hello_world_2.png

…

hello_world_3.png

…

hello_world_4.png

…

hello_world_5.png

…

hello_world_8.png

…

hello_world_9.png

…

hierarchyviewer-layout.png

…

hierarchyviewer-pixelperfect.png

…

home-marquee.jpg

Massive clobber of all HTML files in developer docs for new site design

2012-06-21 21:27:30 -07:00

icon_barriers.png

…

icon_dashboard.png

…

icon_equal.png

…

icon_fast.png

…

icon_open.png

…

jb-accessibility-focus-250.png

Set up preview SDK for jellybean.

2012-06-26 22:44:38 -07:00

jb-accessibility-focus.png

Set up preview SDK for jellybean.

2012-06-26 22:44:38 -07:00

jb-android-4.1.png

Set up preview SDK for jellybean.

2012-06-26 22:44:38 -07:00

jb-appwidgets.png

Set up preview SDK for jellybean.

2012-06-26 22:44:38 -07:00

jb-dev-options-device.png

Doc change: resize some assets for highlights.

2012-11-13 05:02:41 -08:00

jb-device-2.png

Doc change: update image for landing page.

2012-11-13 09:21:00 -08:00

jb-devices.png

Doc change: resize some assets for highlights.

2012-11-13 05:02:41 -08:00

jb-dream-1.png

Doc change: resize some assets for highlights.

2012-11-13 05:02:41 -08:00

jb-external-display.png

Doc change: Add Android 4.2 platform highlights.

2012-11-13 01:39:14 -08:00

jb-lock-calendar.png

Doc change: resize some assets for highlights.

2012-11-13 05:02:41 -08:00

jb-nexus10-1.png

Doc change: Add Android 4.2 platform highlights.

2012-11-13 01:39:14 -08:00

jb-notif-ex1.png

Doc change: swap notification image for generic.

2012-06-28 00:57:27 -07:00

jb-notif-ex.png

Doc change: update Missed Call part of notification image.

2012-06-28 00:52:08 -07:00

jb-r2l.png

Set up preview SDK for jellybean.

2012-06-26 22:44:38 -07:00

jb-rs-chart-gpu.png

Doc change: Add Android 4.2 platform highlights.

2012-11-13 01:39:14 -08:00

jb-rs-chart-versions.png

Doc change: Add Android 4.2 platform highlights.

2012-11-13 01:39:14 -08:00

jb-rtl.png

Doc change: Add Android 4.2 platform highlights.

2012-11-13 01:39:14 -08:00

layout_bar.png

docs: cherrypick from hc-mr2 Change-Id: I42d2befab1c848dc0b9aa5b4c5ac25ee50bd9a7b

2011-08-12 13:38:45 -07:00

layout_editor.png

docs: cherrypick from hc-mr2 Change-Id: I42d2befab1c848dc0b9aa5b4c5ac25ee50bd9a7b

2011-08-12 13:38:45 -07:00

layout_outline.png

docs: cherrypick from hc-mr2 Change-Id: I42d2befab1c848dc0b9aa5b4c5ac25ee50bd9a7b

2011-08-12 13:38:45 -07:00

layoutparams.png

Massive clobber of all HTML files in developer docs for new site design

2012-06-21 21:27:30 -07:00

licensing_add_library.png

docs: update various SDK and AVD Manager screenshots

2012-03-14 16:16:18 -07:00

licensing_arch.png

…

licensing_device_signin.png

…

licensing_flow.png

…

licensing_package.png

docs: update various SDK and AVD Manager screenshots

2012-03-14 16:16:18 -07:00

licensing_public_key.png

…

licensing_test_response.png

…

like_thumb1.png

…

like_thumb2.png

…

like_thumb3.png

…

like_thumb4.png

…

linearlayout.png

…

LivePocketGemsTitleCard.png

Doc change: Add summary page of Android Developers Live videos.

2012-04-19 11:26:06 -07:00

logo_android.gif

…

mediaplayer_state_diagram.gif

…

mediarecorder_state_diagram.gif

…

nfc_tag_dispatch.png

cherrypick from master - docs: nfc updates Change-Id: Iaa782911f14b11bc896ac9ef06db2c43104d1dac

2011-10-17 15:27:55 -07:00

ninepatch_examples.png

…

ninepatch_raw.png

…

no_scrollview.png

…

notepad.png

…

notifications_window.png

Correct executable bit for source files

2012-11-07 10:27:31 -08:00

options_menu.png

Correct executable bit for source files

2012-11-07 10:27:31 -08:00

padding_margins.png

…

palette.png

docs: cherrypick from hc-mr2 Change-Id: I42d2befab1c848dc0b9aa5b4c5ac25ee50bd9a7b

2011-08-12 13:38:45 -07:00

play_dev.png

docs: add landing for gcm

2012-06-26 16:46:21 -07:00

play_tableft.png

Massive clobber of all HTML files in developer docs for new site design

2012-06-21 21:27:30 -07:00

radio_buttons.png

Correct executable bit for source files

2012-11-07 10:27:31 -08:00

robot-sdk.png

Massive clobber of all HTML files in developer docs for new site design

2012-06-21 21:27:30 -07:00

robot-tiny.png

Massive clobber of all HTML files in developer docs for new site design

2012-06-21 21:27:30 -07:00

rs_compute.graffle

cherrypick from master docs: Renderscript changes Change-Id: Ic84b7d8c5c48e118f337e60c8bb5b8bc68b0da16

2012-01-19 12:36:06 -08:00

rs_compute.png

cherrypick from master docs: Renderscript changes Change-Id: Ic84b7d8c5c48e118f337e60c8bb5b8bc68b0da16

2012-01-19 12:36:06 -08:00

rs_graphics.graffle

cherrypick from master docs: Renderscript changes Change-Id: Ic84b7d8c5c48e118f337e60c8bb5b8bc68b0da16

2012-01-19 12:36:06 -08:00

rs_graphics.png

cherrypick from master docs: Renderscript changes Change-Id: Ic84b7d8c5c48e118f337e60c8bb5b8bc68b0da16

2012-01-19 12:36:06 -08:00

rs_overview.graffle

cherrypick from master docs: Renderscript changes Change-Id: Ic84b7d8c5c48e118f337e60c8bb5b8bc68b0da16

2012-01-19 12:36:06 -08:00

rs_overview.png

cherrypick from master docs: Renderscript changes Change-Id: Ic84b7d8c5c48e118f337e60c8bb5b8bc68b0da16

2012-01-19 12:36:06 -08:00

sdk_manager_packages.png

docs: update various SDK and AVD Manager screenshots

2012-03-14 16:16:18 -07:00

sdk-cube.png

Massive clobber of all HTML files in developer docs for new site design

2012-06-21 21:27:30 -07:00

service_lifecycle.png

Massive clobber of all HTML files in developer docs for new site design

2012-06-21 21:27:30 -07:00

setting_width_and_height.png

…

status_bar.png

Correct executable bit for source files

2012-11-07 10:27:31 -08:00

system-architecture.jpg

…

table_layout.png

…

toast.png

small update to Toast guide, flatten sidenav for notifications/toasts,

2012-10-12 12:06:10 -07:00

tools-home.png

Massive clobber of all HTML files in developer docs for new site design

2012-06-21 21:27:30 -07:00

topdev_ann.png

Massive clobber of all HTML files in developer docs for new site design

2012-06-21 21:27:30 -07:00

tracedump.png

…

traceview_profile.png

…

traceview_timeline.png

…

ui-ex-multi-pane.png

Doc change: Add core quality and tablet quality docs and spotlight.

2012-10-05 18:47:10 -07:00

ui-ex-single-panes.png

Doc change: Add core quality and tablet quality docs and spotlight.

2012-10-05 18:47:10 -07:00

usb-host-accessory.png

Doc change: adding usb docs and removed ADK doc. ADK doc will be in another CL

2011-05-03 15:57:27 -07:00

video_thumb_dan.png

…

video_thumb_mike.png

…

viewgroup.png

Massive clobber of all HTML files in developer docs for new site design

2012-06-21 21:27:30 -07:00

views_autocomplete.png

…

views_controls_example2.png

…

views_datewidgets_example1_pickdate.png

…

views_datewidgets_example1_picktime.png

…

views_gallery_example1.png

…

views_grid_example2.png

…

views_image_switcher.png

…

views_imagebutton_example1.png

…

views_layouts_linearlayout_example1.png

…

views_layouts_linearlayout_example7.png

…

views_layouts_relativelayout_example2.png

…

views_layouts_tablelayout_example10.png

…

views_layouts_tablelayout_spanning.png

…

views_lists_example1.png

…

views_spinner.png

…

zippy_bullet.gif

…

zippy_closed.gif

…

zippy_open.gif

…