Scott Main 6dd38cc534 Revert "Revert "resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev" revert to fix conflicts, i'll fix it all later." ...

Submitted the original revert too soon.

This reverts commit ebcee19783c4fe5ba776353e95974383850a4685.

Change-Id: I7c76b9c37a8d919cdf319dae1ae8f444300ed3d4

2013-08-12 17:40:37 +00: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

appwidgets

Doc Update: Fixing images

2012-11-14 18:27:36 -08:00

brand

add Arabic Google Play badges to generator

2013-06-18 15:19:52 -07:00

code_templates

docs: App Template Tool documentation

2012-12-17 14:41:46 -08: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 gpg developer stories.

2013-07-26 19:55:39 +00:00

efficient-downloads

Docs: Added efficient downloads Android U class

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

fundamentals

Doc change - cherry pick from dac-dev: Clean up stray image source files and adjust links etc.

2012-11-27 16:29:40 -08:00

gcm

Revert "Revert "resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev" revert to fix conflicts, i'll fix it all later."

2013-08-12 17:40:37 +00:00

gltracer

docs: GL Tracer, Device Monitor Tools for SDK r20

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

google

Doc change: a new image for play services location landing.

2013-05-13 23:59:20 -07:00

home

update homepage banner for videos to point to new io13 video channel

2013-05-29 12:27:09 -07:00

icon_design

Update Icon Guidelines and Icon Templates Pack for ICS

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

in-app-billing

docs: Updated In-app Billing docs to support subscriptions for V3.

2013-02-13 16:45:41 -08:00

jet

Correct executable bit for source files

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

location

docs: add dev guide for getting user location

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

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

update action bar guide for support lib ABC

2013-07-23 12:17:05 -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 - cherry pick from dac-dev: Clean up stray image source files and adjust links etc.

2012-11-27 16:29:40 -08:00

publishing

Correct executable bit for source files

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

resources

am a539807a: am 37f00afa: am f4d44618: Merge " Doc change - cherry pick from dac-dev: Clean up stray image source files and adjust links etc." into jb-mr1-dev

2012-11-29 12:45:26 -08:00

screens_support

docs: delete orphaned images (the obvious ones)

2013-02-01 11:57:01 -08: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: Support Library Guide

2013-07-23 21:26:49 -07:00

training

new class on using action bar for training basics

2013-08-01 14:56:00 -07:00

ui

update action bar guide for support lib ABC

2013-07-23 12:17:05 -07: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.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

avd-manager.png

docs: update various SDK and AVD Manager screenshots

2012-03-14 16:16:18 -07: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

docs: Merged commits for final release of IABv3 docs.

2012-12-09 18:24:06 -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_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

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-wvga800l.png

docs: Emulator Hardware Acceleration docs for SDK r17

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

example-bad.png

Doc change: add policy guidelines documents.

2013-04-12 14:55:11 -07:00

example-good.png

Doc change: add policy guidelines documents.

2013-04-12 14:55:11 -07:00

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

Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing.

2013-02-21 13:29:07 -08: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

Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing.

2013-02-21 13:29:07 -08:00

gp-dc-details.png

Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing.

2013-02-21 13:29:07 -08:00

gp-dc-home.png

Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing.

2013-02-21 13:29:07 -08:00

gp-dc-profile.png

Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing.

2013-02-21 13:29:07 -08:00

gp-dc-reviews.png

Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing.

2013-02-21 13:29:07 -08:00

gp-dc-stats-mini.png

Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing.

2013-02-21 13:29:07 -08:00

gp-dc-stats.png

Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing.

2013-02-21 13:29:07 -08: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

Doc change: Update DC image, fix typo.

2013-02-22 09:54:45 -08: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-edu-hero7.png

Doc change: add files for edu content.

2013-05-15 04:17:19 -07:00

gp-edu-knum-landscape.png

Doc change: add files for edu content.

2013-05-15 04:17:19 -07:00

gp-edu-optin.png

Doc change: add docs for edu opt-in.

2013-06-23 19:33:00 -07:00

gp-edu-process.png

Doc change: add docs for edu opt-in.

2013-06-23 19:33:00 -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-policy-ads-eula-violation.png

Doc change: add policy guidelines documents.

2013-04-12 14:55:11 -07:00

gp-policy-ads-eula.png

Doc change: add policy guidelines documents.

2013-04-12 14:55:11 -07:00

gp-policy-ads-impersonate-violation.png

Doc change: add policy guidelines documents.

2013-04-12 14:55:11 -07:00

gp-policy-ads-maturity-violation.png

Doc change: add policy guidelines documents.

2013-04-12 14:55:11 -07:00

gp-policy-ads-notif-attr-violation.png

Doc change: add policy guidelines documents.

2013-04-12 14:55:11 -07:00

gp-policy-ads-notif-attr.png

Doc change: add policy guidelines documents.

2013-04-12 14:55:11 -07:00

gp-policy-ads-paywall-violation.png

Doc change: add policy guidelines documents.

2013-04-12 14:55:11 -07:00

gp-policy-ads-paywall.png

Doc change: add policy guidelines documents.

2013-04-12 14:55:11 -07:00

gp-policy-ads-terms.png

Doc change: add policy guidelines documents.

2013-04-12 14:55:11 -07:00

gp-policy-ip-copyright-violation.png

Doc change: add policy guidelines documents.

2013-04-12 14:55:11 -07:00

gp-policy-ip-impersonation-violation.png

Doc change: add policy guidelines documents.

2013-04-12 14:55:11 -07:00

gp-policy-ip-trademark-violation.png

Doc change: add policy guidelines documents.

2013-04-12 14:55:11 -07:00

gp-policy-spam-negreview.png

Doc change: add policy guidelines documents.

2013-04-12 14:55:11 -07:00

gp-policy-spam-reqrating.png

Doc change: add policy guidelines documents.

2013-04-12 14:55:11 -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

Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing.

2013-02-21 13:29:07 -08: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

…

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

iab-thumb.png

Doc change: update develop landing page.

2012-12-17 15:50:43 -08:00

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-android-43.jpg

Doc change: Platform highlights for Android 4.3.

2013-07-23 21:37:56 -07:00

jb-android-43@2x.png

Doc change: Platform highlights for Android 4.3.

2013-07-23 21:37:56 -07:00

jb-appwidgets.png

Set up preview SDK for jellybean.

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

jb-btle.png

Doc change: Platform highlights for Android 4.3.

2013-07-23 21:37:56 -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-gpu-profile-cal-n4.png

Doc change: Platform highlights for Android 4.3.

2013-07-23 21:37:56 -07:00

jb-gpu-profile-clk-n4.png

Doc change: Platform highlights for Android 4.3.

2013-07-23 21:37:56 -07: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-profiles-create-n713.png

Doc change: Platform highlights for Android 4.3.

2013-07-23 21:37:56 -07:00

jb-profiles-restrictions-n713.png

Doc change: Platform highlights for Android 4.3.

2013-07-23 21:37:56 -07:00

jb-pseudo-locale-zz.png

Doc change: Platform highlights for Android 4.3.

2013-07-23 21:37:56 -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-arabic-n4.png

Doc change: Platform highlights for Android 4.3.

2013-07-23 21:37:56 -07:00

jb-rtl-hebrew-n4.png

Doc change: Platform highlights for Android 4.3.

2013-07-23 21:37:56 -07:00

jb-rtl.png

Doc change: Add Android 4.2 platform highlights.

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

jb-systrace.png

Doc change: Platform highlights for Android 4.3.

2013-07-23 21:37:56 -07: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

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_package.png

docs: update various SDK and AVD Manager screenshots

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

licensing_public_key.png

Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing.

2013-02-21 13:29:07 -08:00

licensing_test_response.png

Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing.

2013-02-21 13:29:07 -08:00

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

…

mediadrm_decryption_sequence.png

Make MediaDrm APIs public

2013-04-17 15:24:48 -07:00

mediadrm_overview.png

Make MediaDrm APIs public

2013-04-17 15:24:48 -07:00

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

…

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

play-services-diagram.png

docs: update gms toc and landing pages

2012-11-29 13:14:02 -08:00

radio_buttons.png

Correct executable bit for source files

2012-11-07 10:27:31 -08: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.png

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.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

…

video-Colopl.png

Doc change: Add Colopl video to carousel and spotlight.

2013-07-17 18:00:35 -07:00

viewgroup.png

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

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

zippy_bullet.gif

…

zippy_closed.gif

…

zippy_open.gif

…