Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96616bb5 authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by Android Git Automerger
Browse files

am eec841f0: Merge change 8560 into donut 

Merge commit 'eec841f0'

* commit 'eec841f0':
  AI 150460: Add  missing art files for menu_guidelines doc.
  AI 150397: turn off the right arrow in the carousel -- we only have 3 items.
  AI 150390: Roll the docs back to 1.5 r2, temporarily.
  AI 150381: Add localized content (ja2) to developer site.
  AI 150380: Add localized content (ja) for developer site.
  AI 150369: Add localized TOCs for developer site.
  AI 150351: Doc updates for Android 1.5 SDK r3.
parents f0e9f05d eec841f0

Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -444,7 +444,8 @@ LOCAL_DROIDDOC_OPTIONS:= \ 
		$(framework_docs_LOCAL_DROIDDOC_OPTIONS) \

		$(web_docs_sample_code_flags) \

		-toroot / \

		-hdf android.whichdoc online

		-hdf android.whichdoc online \

		-hdf template.showLanguageMenu true



LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk

LOCAL_DROIDDOC_CUSTOM_ASSET_DIR:=assets-sdk

docs/html/guide/guide_toc.cs

+370 −139

File changed.

Preview size limit exceeded, changes collapsed.

docs/html/images/menu_design/ContextMenuDiagram.png

0 → 100644
+77.9 KiB
Loading image diff...

docs/html/images/menu_design/ContextMenuViewContactDiagram.png

0 → 100644
+83.6 KiB
Loading image diff...

docs/html/images/menu_design/MenuDiagram.png

0 → 100644
+152 KiB
Loading image diff...