Robert Ly 4e552533ea resolved conflicts for merge of b078d942 to ics-mr1 ...

Change-Id: I831c06f2c198cc8825788a05770397457e8d511c

2012-01-19 13:25:07 -08:00

..

activity_task_design

AI 149404: Am sending again with the latest changes

2009-05-29 19:27:02 -07:00

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

developing

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

2011-10-27 10:40:13 -07:00

fundamentals

docs: second set of diagram updates

2012-01-04 17:20:48 -08:00

hello_l10n

SDK doc change per http://b/2158141 - adds new res wizard to L10N tutorial.

2009-10-12 16:17:42 -07:00

home

Android Design

2012-01-10 16:42:13 -08:00

icon_design

Update Icon Guidelines and Icon Templates Pack for ICS

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

jet

AI 147718: Created .jd doc file for the JetCreator manual. Cleaned up the content to only use HTML tags, no more ugly Word generated tags. Removed references to visio files, converted all assets to PNG and renamed them with human understandable names. Added reference to JetPlayer javadoc.

2009-04-24 12:33:40 -07:00

location

docs: add dev guide for getting user location

2010-08-20 14:21:26 -07:00

market

cherrypick Change-Id: I09778f0795dcb5d87cde652bfb7d514a0dfd9782

2011-07-27 12:34:48 -07:00

menu_design

AI 150460: Add missing art files for menu_guidelines doc.

2009-07-10 14:40:48 -07:00

opengl

docs: OpenGL ES 1.0 and 2.0 Tutorials

2011-08-16 16:19:52 -07:00

practices

docs: add guide for optimizing tablet apps for handsets

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

preview_hc

docs: add preview sdk docs to provide an api overview and install steps,

2010-11-29 14:28:13 -08:00

providers

Doc change: new Calendar content provider doc

2011-11-10 10:56:34 -08:00

publishing

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

2011-10-27 10:40:13 -07:00

resources

docs: second set of diagram updates

2012-01-04 17:20:48 -08:00

screens_support

cherrypick Change-Id: I8560c5b0ace7ca75031a83270f3eaf2470d04a2c

2011-08-12 09:27:13 -07:00

search

docs: add Search dev guide

2010-03-17 10:07:18 -07:00

testing

Doc change: cherrypick testing changes from master. Squashed commit of the following:

2010-10-10 13:20:12 -07:00

training

Doc merge from master:Training class on Identifying and Authenticating Users.

2011-12-15 19:45:27 -08:00

ui

docs: Big update to action bar guide for ICS.

2011-11-17 12:24:31 -08:00

webapps

docs: provide overview of the web apps docs and revise images in the targeting doc

2010-11-03 14:48:21 -07:00

widget_design

Update Widget Design guidelines for ICS

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

activity_fragment_lifecycle.png

docs: Update lifecycle diagrams to use new omnigraffle designs;

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

activity_lifecycle.graffle

docs: Update lifecycle diagrams to use new omnigraffle designs;

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

activity_lifecycle.png

docs: Update lifecycle diagrams to use new omnigraffle designs;

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

android_adc.gif

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

android_icon_125.png

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

anr.png

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -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: replace misc screenshots from Mac with shots from Windows

2011-03-08 18:02:58 -08:00

axis_device.png

More improvements to the SensorManager documentation

2010-07-02 17:57:10 -07:00

axis_globe_inverted.png

Fix SensorManager.getOrientation() documentation.

2010-11-19 16:25:11 -08:00

axis_globe.png

More improvements to the SensorManager documentation

2010-07-02 17:57:10 -07:00

billing_arch.png

cherrypick Change-Id: Ica1b68a1687917432d39d7d116c9c24fa1644a83

2011-02-08 09:18:42 -08:00

billing_check_supported.png

cherrypick Change-Id: Ica1b68a1687917432d39d7d116c9c24fa1644a83

2011-02-08 09:18:42 -08:00

billing_checkout_flow.png

cherrypick Change-Id: Ica1b68a1687917432d39d7d116c9c24fa1644a83

2011-02-08 09:18:42 -08:00

billing_list_form_2.png

Cherrypick from HCMR2 Change ID: Id849cb25098fef76c96c4935db31ebc1422d74d8

2011-12-01 11:46:59 -08:00

billing_list_form.png

IAB doc update for final launch

2011-03-28 19:50:20 -07:00

billing_package.png

docs: replace misc screenshots from Mac with shots from Windows

2011-03-08 18:02:58 -08:00

billing_product_list_entry.png

IAB doc update for final launch

2011-03-28 19:50:20 -07:00

billing_product_list.png

Cherrypick from HCMR2 Change ID: Id849cb25098fef76c96c4935db31ebc1422d74d8

2011-12-01 11:46:59 -08:00

billing_public_key.png

cherrypick Change-Id: Ica1b68a1687917432d39d7d116c9c24fa1644a83

2011-02-08 09:18:42 -08:00

billing_refund.png

IAB doc updates for final launch plus bug fixes

2011-03-24 10:23:52 -07:00

billing_request_purchase.png

IAB doc updates for final launch plus bug fixes

2011-03-24 10:23:52 -07:00

billing_restore_transactions.png

IAB doc updates for final launch plus bug fixes

2011-03-24 10:23:52 -07:00

billing_test_flow.png

cherrypick Change-Id: Ica1b68a1687917432d39d7d116c9c24fa1644a83

2011-02-08 09:18:42 -08:00

binder_rpc.png

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

bt_enable_discoverable.png

docs: add images used in BT developer guide.

2009-12-09 18:16:02 -08:00

bt_enable_request.png

docs: add images used in BT developer guide.

2009-12-09 18:16:02 -08:00

bt_pairing_request.png

docs: add images used in BT developer guide.

2009-12-09 18:16:02 -08:00

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

canvas.png

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

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

content_uri.png

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

custom_message.png

docs: update Notification dev guide with info about custom notification text colors

2011-09-22 10:19:25 -07:00

custom_toast.png

AI 147803: add docs and images for docs on Toast and Notification docs

2009-04-26 15:50:49 -07:00

debug-ddms.png

Doc change: Debugging section of dev guide restructuring

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

debugging.png

Doc change: Debugging section of dev guide restructuring

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

designing_ui_layout_example.png

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

designing_ui_relative_layout.png

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

dialog_buttons.png

AI 147804: add new doc about Dialogs

2009-04-26 15:51:58 -07:00

dialog_custom.png

AI 147804: add new doc about Dialogs

2009-04-26 15:51:58 -07:00

dialog_list.png

AI 147804: add new doc about Dialogs

2009-04-26 15:51:58 -07:00

dialog_progress_bar.png

AI 147804: add new doc about Dialogs

2009-04-26 15:51:58 -07:00

dialog_progress_spinning.png

AI 147804: add new doc about Dialogs

2009-04-26 15:51:58 -07:00

dialog_singlechoicelist.png

AI 147804: add new doc about Dialogs

2009-04-26 15:51:58 -07:00

draw9patch-bad.png

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

draw9patch-norm.png

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

drm_arch.png

DRM API doc scrub

2011-03-23 13:21:48 -07:00

e-mini-hvga-l.png

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

e-mini-hvga-p.png

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

e-mini-qvga-l.png

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

e-mini-qvga-p.png

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

emulator-hvga-p.png

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

emulator-wvga800l.png

Add docs for SDK update.

2009-09-02 19:08:28 -07:00

emulator.png

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

fragment_lifecycle.png

docs: Update lifecycle diagrams to use new omnigraffle designs;

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

gradient_drawable.png

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

hello_world_0.png

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

hello_world_1.png

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

hello_world_2.png

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

hello_world_3.png

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

hello_world_4.png

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

hello_world_5.png

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

hello_world_8.png

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

hello_world_9.png

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

hierarchyviewer-layout.png

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

hierarchyviewer-pixelperfect.png

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

icon_barriers.png

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

icon_dashboard.png

docs: add developer dashboard page and add topic link

2009-12-16 10:08:32 -08:00

icon_equal.png

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

icon_fast.png

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

icon_open.png

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -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

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

licensing_add_library.png

docs: replace misc screenshots from Mac with shots from Windows

2011-03-08 18:02:58 -08:00

licensing_arch.png

Doc change: Add docs for licensing service.

2010-07-26 11:07:24 -07:00

licensing_device_signin.png

Doc change: Add docs for licensing service.

2010-07-26 11:07:24 -07:00

licensing_flow.png

Doc change: Add docs for licensing service.

2010-07-26 11:07:24 -07:00

licensing_gapis_8.png

docs: replace misc screenshots from Mac with shots from Windows

2011-03-08 18:02:58 -08:00

licensing_package.png

docs: replace misc screenshots from Mac with shots from Windows

2011-03-08 18:02:58 -08:00

licensing_public_key.png

Doc change: Add docs for licensing service.

2010-07-26 11:07:24 -07:00

licensing_test_response.png

Doc change: Add docs for licensing service.

2010-07-26 11:07:24 -07:00

like_thumb1.png

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

like_thumb2.png

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

like_thumb3.png

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

like_thumb4.png

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

linearlayout.png

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

logo_android.gif

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

mediaplayer_state_diagram.gif

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

mediarecorder_state_diagram.gif

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

nfc_tag_dispatch.png

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

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

ninepatch_examples.png

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

ninepatch_raw.png

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

no_scrollview.png

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

notepad.png

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

notifications_window.png

AI 147803: add docs and images for docs on Toast and Notification docs

2009-04-26 15:50:49 -07:00

options_menu.png

update menu dev guide with more info about action bar

2011-02-03 18:02:55 -08:00

padding_margins.png

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

palette.png

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

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

radio_buttons.png

update menu dev guide with more info about action bar

2011-02-03 18:02:55 -08: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

DOC CHANGE: Fix bugs in Installing SDK topic

2011-02-02 17:01:52 -08:00

service_lifecycle.png

docs: Update lifecycle diagrams to use new omnigraffle designs;

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

setting_width_and_height.png

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

status_bar.png

AI 147803: add docs and images for docs on Toast and Notification docs

2009-04-26 15:50:49 -07:00

system-architecture.jpg

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

table_layout.png

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

toast.png

AI 147803: add docs and images for docs on Toast and Notification docs

2009-04-26 15:50:49 -07:00

tracedump.png

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

traceview_profile.png

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

traceview_timeline.png

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08: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

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

video_thumb_mike.png

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

viewgroup.png

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

views_autocomplete.png

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

views_controls_example2.png

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

views_datewidgets_example1_pickdate.png

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

views_datewidgets_example1_picktime.png

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

views_gallery_example1.png

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

views_grid_example2.png

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

views_image_switcher.png

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

views_imagebutton_example1.png

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

views_layouts_linearlayout_example1.png

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

views_layouts_linearlayout_example7.png

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

views_layouts_relativelayout_example2.png

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

views_layouts_tablelayout_example10.png

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

views_layouts_tablelayout_spanning.png

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

views_lists_example1.png

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

views_spinner.png

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

zippy_bullet.gif

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

zippy_closed.gif

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

zippy_open.gif

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00